diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 30d60028..e4e29ba7 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
index 1b3071ba..84bffc3d 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
@@ -396,18 +396,63 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                 } else
                     showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
             }
+            else
+            {
+                scheduleTaskLater(()->{
+                    showProgressBar(false, "");
+                    if (exchangeCalculationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+                        ExchangeCalculationModel data = exchangeCalculationApiResponse.getData();
+                        selectedTransferFeeAmount = data.getScCharge();
+                        selectedExRate = data.getExRateDisplay();
+                        selectedExRateWithoutTrunc = data.getExRate();
+                        selectedRecipientAmount = data.getpAmt();
+                        selectedSendAmount = data.getCollAmt();
+                        selectedsendingCurrency = data.getCollCurr();
+                        selectedExRateId = data.getExrateId();
+                        selectedTransferAmount=data.getsAmt();
+
+                        String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (Transfer Fee Included)";
+                        String exRateDisplay = "   " + selectedExRate + " (Current Exchange Rate)";
+
+                        showTransferfeeAndExRate(true, transferDisplay, exRateDisplay);
+                        showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount);
+                        updateButtonToCalculate(false);
+
+                    } else
+                        showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
+
+                });
+            }
         }
 
         @Override
         public void onFailed(String message) {
-            showProgressBar(false, "");
-            showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+            if(isUIReady()) {
+                showProgressBar(false, "");
+                showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+            }
+            else
+            {
+                scheduleTaskLater(()->{
+                    showProgressBar(false, "");
+                    showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+                });
+            }
         }
 
         @Override
         protected void onConnectionNotEstablished(String message) {
-            showProgressBar(false, "");
-            showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
+            if(isUIReady()) {
+                showProgressBar(false, "");
+                showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
+            }
+            else
+            {
+                scheduleTaskLater(()->{
+                    showProgressBar(false, "");
+                    showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
+                });
+            }
         }
     }
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
index 77bc3643..0c2d6fe3 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
@@ -24,6 +24,7 @@ import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
+import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.exchange_rate.view.SelectedRedBorderDecoration;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.adapter.SendMoneyPayoutModeRvAdapter;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.AccountValidationApiResponse;
@@ -413,15 +414,20 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
                 if (payoutModeApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
                     apiResponseData = payoutModeApiResponse.getData();
                     setDataToPaymentMode(payoutModeApiResponse.getData().getPayoutMode());
-                } else
-                    showToastMessage(payoutModeApiResponse.getMsg());
+                } else {
+//                    showToastMessage(payoutModeApiResponse.getMsg());
+                    showPopUpMessage(payoutModeApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
+                }
             } else {
                 scheduleTaskLater(() -> {
                     showProgressBar(false, "");
                     if (payoutModeApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
                         setDataToPaymentMode(payoutModeApiResponse.getData().getPayoutMode());
                     else
-                        showToastMessage(payoutModeApiResponse.getMsg());
+                    {
+//                        showToastMessage(payoutModeApiResponse.getMsg());
+                        showPopUpMessage(payoutModeApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
+                    }
                 });
             }
         }
@@ -430,9 +436,13 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         public void onFailed(String message) {
             if (isUIReady()) {
                 showProgressBar(false, "");
+                showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
+
             } else {
                 scheduleTaskLater(() -> {
                     showProgressBar(false, "");
+                    showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
+
                 });
             }
         }
@@ -440,10 +450,14 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         @Override
         protected void onConnectionNotEstablished(String message) {
             if (isUIReady()) {
+                showProgressBar(false, "");
+                showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
 
             } else {
                 scheduleTaskLater(() -> {
                     showProgressBar(false, "");
+                    showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
+
                 });
             }
         }
@@ -459,13 +473,21 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
                 if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
                     ((SendMoneyActionListener) getActivity()).showAmountDetailPage();
                 else
-                    showToastMessage(accountValidationApiResponse.getMsg());
+                {
+//                    showToastMessage(accountValidationApiResponse.getMsg());
+                    showPopUpMessage(accountValidationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
+
+                }
             } else {
                 scheduleTaskLater(() -> {
                     if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
                         ((SendMoneyActionListener) getActivity()).showAmountDetailPage();
                     else
-                        showToastMessage(accountValidationApiResponse.getMsg());
+                    {
+//                    showToastMessage(accountValidationApiResponse.getMsg());
+                        showPopUpMessage(accountValidationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED,null);
+
+                    }
                 });
             }
         }
@@ -473,11 +495,14 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         @Override
         public void onFailed(String message) {
             if (isUIReady()) {
-                showToastMessage(message);
+//                showToastMessage(message);
+                showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
+
 
             } else {
                 scheduleTaskLater(() -> {
-                    showToastMessage(message);
+//                    showToastMessage(message);
+                    showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED,null);
                 });
             }
         }
@@ -485,10 +510,12 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         @Override
         protected void onConnectionNotEstablished(String message) {
             if (isUIReady()) {
-                showToastMessage(message);
+//                showToastMessage(message);
+                showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
             } else {
                 scheduleTaskLater(() -> {
-                    showToastMessage(message);
+//                    showToastMessage(message);
+                    showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET,null);
                 });
             }
         }