From 391cb49b1eb8e7cce2b5b7ca17257c3e4d6b2f8b Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Wed, 20 Mar 2019 10:42:39 +0900
Subject: [PATCH] Exrate fixes in resend

---
 .../model/resend/ReceiverDetailModel.java         | 12 ++++++------
 .../presenter/resend/ReSendMoneyV2Presenter.java  | 15 +++++++++++----
 .../resend/ReSendMoneyV2PresenterInterface.java   |  4 ++++
 .../ResendMoneyAmountDetailFragment.java          | 10 ++++++++++
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/model/resend/ReceiverDetailModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/model/resend/ReceiverDetailModel.java
index 6607d595..f07734ca 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/model/resend/ReceiverDetailModel.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/model/resend/ReceiverDetailModel.java
@@ -16,9 +16,9 @@ public class ReceiverDetailModel {
     @SerializedName("rMobile")
     @Expose
     private String rMobile;
-    @SerializedName("pCountry")
+    @SerializedName("rCountryCode")
     @Expose
-    private String pCountry;
+    private String rCountryCode;
     @SerializedName("deliveryMethod")
     @Expose
     private String deliveryMethod;
@@ -58,12 +58,12 @@ public class ReceiverDetailModel {
         this.rMobile = rMobile;
     }
 
-    public String getPCountry() {
-        return pCountry;
+    public String getRCountryCode() {
+        return rCountryCode;
     }
 
-    public void setPCountry(String pCountry) {
-        this.pCountry = pCountry;
+    public void setRCountryCode(String rCountryCode) {
+        this.rCountryCode = rCountryCode;
     }
 
     public String getDeliveryMethod() {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
index 18396078..3c3d5b80 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
@@ -1,7 +1,5 @@
 package com.gmeremit.online.gmeremittance_native.resendV2.presenter.resend;
 
-import android.util.Log;
-
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.WebRequestModel;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
@@ -11,7 +9,6 @@ import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoModelV2;
 import com.gmeremit.online.gmeremittance_native.resendV2.gateway.resend.ReSendMoneyV2Gateway;
 import com.gmeremit.online.gmeremittance_native.resendV2.model.resend.ResendRelatedDataModel;
 import com.gmeremit.online.gmeremittance_native.resendV2.model.transactionlisting.PreviousTransactionRelatedData;
-import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyAPIRequestBody;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionResponseBody;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.verification.VerificationViewModel;
 import com.gmeremit.online.gmeremittance_native.transactionpasspromt.PasswordPromptListener;
@@ -147,6 +144,16 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
         }
     }
 
+    @Override
+    public String getSelectedCurrency() {
+       return resendRelatedData.getExRate().getPCurrency();
+    }
+
+    @Override
+    public String getSelectedCountry() {
+        return resendRelatedData.getReceiver().getRCountryCode();
+    }
+
 
     public void performSendMoneyTransaction(String password) {
 
@@ -215,7 +222,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
             resendRelatedData.getExRate().setPaymentType(previousTransactionRelatedData.getSelectedAutoDebitAccount().getType());
             resendRelatedData.getExRate().setUserId(gateway.getUserID());
 
-            Log.d("ResendRelatedData",resendRelatedData.getRemitDetail().toString());
+
             getExRateFromNetwork();
         }
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java
index 8ec1c1a0..aecf373a 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java
@@ -41,6 +41,10 @@ public interface ReSendMoneyV2PresenterInterface extends BasePresenterInterface
 
     void getPrepData();
 
+    String getSelectedCurrency();
+
+    String getSelectedCountry();
+
     interface ReSendMoneyV2ContractInterface extends BaseContractInterface
     {
         void promptPassword(PasswordPromptListener listener);
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
index aa69a9e7..1395603b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
@@ -299,6 +299,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie
                     showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount);
                     updateButtonToCalculate(false);
 
+                    String selectedCurrency= ((ReSendMoneyActionListener)getActivity()).getPresenter().getSelectedCurrency();
+                    String selectedCountryCode= ((ReSendMoneyActionListener)getActivity()).getPresenter().getSelectedCountry();
+
+                    showSelectedCurrency(selectedCountryCode,selectedCurrency);
+
                 } else
                     showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
             } else {
@@ -322,6 +327,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie
                         showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount);
                         updateButtonToCalculate(false);
 
+                        String selectedCurrency= ((ReSendMoneyActionListener)getActivity()).getPresenter().getSelectedCurrency();
+                        String selectedCountryCode= ((ReSendMoneyActionListener)getActivity()).getPresenter().getSelectedCountry();
+
+                        showSelectedCurrency(selectedCountryCode,selectedCurrency);
+
                     } else
                         showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);