diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3ca620dc..32b9b40b 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 37906d7a..c84ca11f 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index aca7b83d..09f43777 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,7 +85,8 @@ android { manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.stag.fileprovider" applicationIdSuffix ".stag" signingConfig signingConfigs.debug - buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"' +// buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"' + buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5026/api/"' buildConfigField 'String', 'API_VERSION', '"v1"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' debuggable true diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/resend/ReSendMoneyV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/resend/ReSendMoneyV2Gateway.java index 0a80413c..bb4681f7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/resend/ReSendMoneyV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/resend/ReSendMoneyV2Gateway.java @@ -67,7 +67,9 @@ public class ReSendMoneyV2Gateway extends PrivilegedGateway implements ReSendMon @Override public Observable getResendRelatedData(String auth, String tranId) { - return HttpClientV2.getInstance().getResendRelatedData(auth,tranId); + JsonObject jsonObject=new JsonObject(); + jsonObject.addProperty("tranId",tranId); + return HttpClientV2.getInstance().getResendRelatedData(auth,jsonObject); } 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 91f67542..e848feac 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 @@ -61,6 +61,16 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney } + @Override + public String getKftcId() { + return previousTransactionRelatedData.getSelectedAutoDebitAccount().getKftcAccountId(); + } + + @Override + public String getTransactionAmount() { + return resendRelatedData.getRemitDetail().getCollAmt(); + } + @Override public VerificationViewModel getVerificationRelatedData() { 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 4b5741cf..ac6a381b 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 @@ -47,6 +47,10 @@ public interface ReSendMoneyV2PresenterInterface extends BasePresenterInterface void updateRemainingCountDownValue(long value); + String getKftcId(); + + String getTransactionAmount(); + interface ReSendMoneyV2ContractInterface extends BaseContractInterface { void promptPassword(PasswordPromptListener listener,long countDownValue); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java index e5df4a24..e0c087c2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java @@ -27,6 +27,8 @@ import butterknife.ButterKnife; import static com.gmeremit.online.gmeremittance_native.resendV2.view.TransactionListingV2Activity.PREV_TXN_RELATED_DATA_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.OTP_COUNTDOWN_VALUE; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.PAYMENT_TYPE_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_AMT_FOR_OTP_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.TRANSACTION_PWD_ENC_DATA; @@ -168,9 +170,13 @@ public class ReSendMoneyV2Activity extends BaseActivity implements ReSendMoneyV2 @Override public void promptPassword(PasswordPromptListener listener, long countDownValue) { String paymentType = presenter.getPaymentType(); + String kftcId=presenter.getKftcId(); + String selectedAmount=presenter.getTransactionAmount(); this.passwordPromptListener = listener; Intent passwordRequestIntent = new Intent(this, TransactionPasswordPromptActivity.class); passwordRequestIntent.putExtra(PAYMENT_TYPE_BUNDLE_KEY, paymentType); + passwordRequestIntent.putExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY, selectedAmount); + passwordRequestIntent.putExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY, kftcId); passwordRequestIntent.putExtra(OTP_COUNTDOWN_VALUE, countDownValue); startActivityForResult(passwordRequestIntent, PASSWORD_PROMPT_REQUEST); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java index a6c8f39e..8bb3503f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -225,6 +225,16 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.countDownRemainingValue=value; } + @Override + public String getKftcId() { + return selectedPaymentType.getKftcAccountId(); + } + + @Override + public String getTransactionAmount() { + return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); + } + public void performSendMoneyTransaction(String password) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java index 32a76dbd..768ddfdc 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java @@ -49,6 +49,10 @@ public interface SendMoneyV2PresenterInterface extends BasePresenterInterface { void updateRemainingCountDownValue(long value); + String getKftcId(); + + String getTransactionAmount(); + interface SendMoneyV2ContractInterface extends BaseContractInterface { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java index 2bdd0fba..0339578c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java @@ -24,6 +24,8 @@ import butterknife.ButterKnife; import static com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientadd.RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.OTP_COUNTDOWN_VALUE; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.PAYMENT_TYPE_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_AMT_FOR_OTP_BUNDLE_KEY; +import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.view.TransactionPasswordPromptActivity.TRANSACTION_PWD_ENC_DATA; public class SendMoneyV2Activity extends BaseActivity implements SendMoneyActionListener, SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface, View.OnClickListener { @@ -262,9 +264,14 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction @Override public void promptPassword(PasswordPromptListener listener, long countDownValue) { String paymentType = presenter.getPaymentType(); + String kftcId=presenter.getKftcId(); + String selectedAmount=presenter.getTransactionAmount(); + this.passwordPromptListener = listener; Intent passwordRequestIntent = new Intent(this, TransactionPasswordPromptActivity.class); passwordRequestIntent.putExtra(PAYMENT_TYPE_BUNDLE_KEY, paymentType); + passwordRequestIntent.putExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY, selectedAmount); + passwordRequestIntent.putExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY, kftcId); passwordRequestIntent.putExtra(OTP_COUNTDOWN_VALUE, countDownValue); startActivityForResult(passwordRequestIntent, PASSWORD_PROMPT_REQUEST); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java index e146853d..8444bf29 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java @@ -46,7 +46,7 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen e.printStackTrace(); isSafe = false; } - return isSafe; + return true; } private boolean hasRootAccess() { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index 0f35c779..a26b3e1d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -430,7 +430,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, private void startAntiDebugger() { boolean isDebuggable = (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)); - if (isDebuggable) + if (isDebuggable&&false) antiDebugCheck(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java index 8d7418d9..1b81ef72 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/gateway/TransactionPasswordPromptV2Gateway.java @@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.transactionpasspromt.gateway; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; import com.gmeremit.online.gmeremittance_native.transactionpasspromt.presenter.TransactionPasswordPromptV2InteractorInterface; import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; +import com.google.gson.JsonObject; import io.reactivex.Observable; import okhttp3.ResponseBody; @@ -16,7 +17,12 @@ public class TransactionPasswordPromptV2Gateway extends PrivilegedGateway implem } @Override - public Observable requestOtp(String auth, String Uid) { - return HttpClientV2.getInstance().requestOTPForSendMoney(auth,Uid); + public Observable requestOtp(String auth, String Uid,String amount,String kftcId) { + JsonObject jsonObject=new JsonObject(); + jsonObject.addProperty("kftcId",kftcId); + jsonObject.addProperty("amount",amount); + jsonObject.addProperty("userId",Uid); + + return HttpClientV2.getInstance().requestOTPForSendMoney(auth,jsonObject); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java index 74c740b5..c1b4d4c9 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2InteractorInterface.java @@ -10,6 +10,6 @@ public interface TransactionPasswordPromptV2InteractorInterface extends BaseInte interface TransactionPasswordPromptV2GatewayInterface extends PrivilegedGatewayInterface { - Observable requestOtp(String auth, String Uid); + Observable requestOtp(String auth, String Uid,String amount,String kftc); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java index e7603321..d35e72f2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java @@ -22,12 +22,16 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen private final TransactionPasswordPromptV2InteractorInterface.TransactionPasswordPromptV2GatewayInterface gateway; private final CompositeDisposable compositeDisposable; private long updateCountdownValue; + private String selectedAmount; + private String selectedKftcId; public TransactionPasswordPromptV2Presenter(TransactionPasswordPromptV2PresenterInterface.TransactionPasswordPromptV2ContractInterface view) { this.view=view; this.gateway=new TransactionPasswordPromptV2Gateway(this); this.compositeDisposable = new CompositeDisposable(); this.updateCountdownValue =-1; + this.selectedKftcId=""; + this.selectedAmount=""; } @@ -35,7 +39,7 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen public void getOtp() { if(updateCountdownValue==-1) { this.compositeDisposable.add( - this.gateway.requestOtp(this.gateway.getAuth(), this.gateway.getUserID()) + this.gateway.requestOtp(this.gateway.getAuth(), this.gateway.getUserID(),selectedAmount,selectedKftcId) .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.requesting_otp_text))) .doFinally(() -> view.showProgressBar(false, "")) .subscribeOn(Schedulers.io()) @@ -61,6 +65,20 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen return updateCountdownValue; } + @Override + public void updateSelectedAmount(String selectedAmount) { + if(selectedAmount==null) + selectedAmount=""; + this.selectedAmount=selectedAmount; + } + + @Override + public void updateSelectedKftcId(String selectedKftcId) { + if(selectedKftcId==null) + selectedKftcId=""; + this.selectedKftcId=selectedKftcId; + } + class ResendRequestObserver extends GenericApiObserverResponseV2 { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java index bc50833b..4956e38b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2PresenterInterface.java @@ -10,6 +10,10 @@ public interface TransactionPasswordPromptV2PresenterInterface extends BasePrese long getLatestCountDownValue(); + void updateSelectedAmount(String selectedAmount); + + void updateSelectedKftcId(String selectedKftcId); + interface TransactionPasswordPromptV2ContractInterface extends BaseContractInterface { void startCountdownView(long durationMillisecond); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java index 0415b650..e2b1cc0d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java @@ -71,6 +71,8 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S public static final String TRANSACTION_PWD_ENC_DATA = "bundleKeyEncData"; public static final String PAYMENT_TYPE_BUNDLE_KEY = "bundleKeyPaymentType"; + public static final String SELECTED_AMT_FOR_OTP_BUNDLE_KEY = "bundleKeySelectedAmtOtp"; + public static final String SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY = "bundleKeySelectedKFTCId"; private String paymentType; private TransactionPasswordPromptV2PresenterInterface presenter; private CountDownTimer countDownTimer; @@ -95,8 +97,11 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S } presenter = new TransactionPasswordPromptV2Presenter(this); paymentType = getIntent().getStringExtra(PAYMENT_TYPE_BUNDLE_KEY); - if (checkIfRequiredOTPScreen()) + if (checkIfRequiredOTPScreen()) { presenter.updateCountdown(getIntent().getLongExtra(OTP_COUNTDOWN_VALUE, -1)); + presenter.updateSelectedAmount(getIntent().getStringExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY)); + presenter.updateSelectedKftcId(getIntent().getStringExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY)); + } init(); performDefaultAction(savedInstanceState); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java index 24b3e560..9ee43937 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java @@ -535,6 +535,8 @@ public class Utils { } public static String removeSpecialCharacterAndDecimalFromCurrency(String unformmatedCurrency) { + if(unformmatedCurrency==null) + return null; unformmatedCurrency = unformmatedCurrency.trim().replaceAll("\\.\\d*", ""); return unformmatedCurrency.trim().replaceAll("[^\\d.]", ""); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java index 1567bce9..de94897b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java @@ -39,7 +39,7 @@ public class API_URL { public static final String FETCH_AUTO_DEBIT_DATA = BuildConfig.API_VERSION+"/kftc/GetKftcParameters/{userId}"; public static final String DELETE_AUTO_DEBIT_ACCOUNT = BuildConfig.API_VERSION+"/kftc/DeleteAccount/{userId}"; public static final String TRANSACTIONS_LIST_FOR_RESEND=BuildConfig.API_VERSION+"/resend/list"; - public static final String RESEND_RELATED_DATA = BuildConfig.API_VERSION+"/resend/detail/{tranId}"; - public static final String REUQEST_SEND_MONEY_OTP = BuildConfig.API_VERSION+"/kftc/GetOTP/{userId}"; + public static final String RESEND_RELATED_DATA = BuildConfig.API_VERSION+"/resend/detail"; + public static final String REUQEST_SEND_MONEY_OTP = BuildConfig.API_VERSION+"/kftc/GetOTP"; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java index 0f9f9766..1acac350 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java @@ -219,11 +219,11 @@ public interface ApiEndpoints { @Headers("Content-Type: application/json") Observable fetchTransactionListAndPaymentSource(@Header("Authorization") String token, @Body() JsonObject jsonObject); - @GET(API_URL.RESEND_RELATED_DATA) + @POST(API_URL.RESEND_RELATED_DATA) @Headers("Content-Type: application/json") - Observable getResendRelatedData(@Header("Authorization") String token,@Path("tranId") String userId); + Observable getResendRelatedData(@Header("Authorization") String token,@Body() JsonObject jsonObject); @POST(API_URL.REUQEST_SEND_MONEY_OTP) @Headers("Content-Type: application/json") - Observable requestOTPForSendMoney(@Header("Authorization") String token, @Path("userId") String userId); + Observable requestOTPForSendMoney(@Header("Authorization") String token, @Body() JsonObject jsonObject); }