Cash pickup update

app/src/main/java/com/swifttech/remit/android/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java

@@ -34,7 +34,7 @@ public class CashPickupToWalletPresenter extends BaseViewModel implements CashPi
     private final CompositeDisposable viewSubs;
     private final CompositeDisposable useCaseSubs;
     private String selectedControlNo;
-    private CashPickupTxnDetailDTO currentCashPickupTxnDetail;
+    private String currentCashPickupTxnId;
 
     public CashPickupToWalletPresenter(CashPickupToWalletPresenterInterface.CashPickupToWalletContract view, CashPickupToWalletGatewayInterface cashPickupToWalletGateway) {
         this.view = view;
@@ -65,17 +65,9 @@ public class CashPickupToWalletPresenter extends BaseViewModel implements CashPi
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeWith(new CashPickupTxnSearchObserver())
         );
-        //TODO mocked
-//        showDummyResponse();
     }
 
-    private void showDummyResponse() {
-        CashPickupTxnDetailDTO dummy=new CashPickupTxnDetailDTO();
-        dummy.seedDummyValues();
-        currentCashPickupTxnDetail=dummy;
-        cashPickupTxnDetailDTOMutableLiveData.setValue(dummy);
-        view.showTxnDetailScreen();
-    }
+
 
     @Override
     public void redeemCashPickup() {
@@ -86,15 +78,13 @@ public class CashPickupToWalletPresenter extends BaseViewModel implements CashPi
             @Override
             public void onRemitAuthSuccess(RemitAuthSuccessResult result) {
                 useCaseSubs.add(
-                        gateway.redeemCashPickupTxn(gateway.getAuth(), gateway.getUserID(), selectedControlNo, "", "")
+                        gateway.redeemCashPickupTxn(gateway.getAuth(), gateway.getUserID(), selectedControlNo, currentCashPickupTxnId, result.getResult())
                                 .doOnSubscribe(subs -> view.showProgressBar(true, ""))
                                 .subscribeOn(Schedulers.io())
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .doFinally(() -> view.showProgressBar(false, ""))
                                 .subscribeWith(new CashPickupTxnRedeemObserver())
                 );
-                //TODO mocked
-//                view.showPopUpMessage("Redeem Success", CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
             }
 
             @Override
@@ -158,7 +148,7 @@ public class CashPickupToWalletPresenter extends BaseViewModel implements CashPi
         @Override
         protected void onSuccess(GenericResponseDataModel<CashPickupTxnDetailDTO> t) {
             if (Constants.SUCCESS_CODE_V2.equalsIgnoreCase(t.getErrorCode())) {
-                currentCashPickupTxnDetail=t.getData();
+                currentCashPickupTxnId = t.getData().getTxnId();
                 cashPickupTxnDetailDTOMutableLiveData.setValue(t.getData());
                 view.showTxnDetailScreen();
             } else {

app/src/main/java/com/swifttech/remit/android/features/home/presenter/HomeV2Presenter.java

@@ -37,7 +37,6 @@ import retrofit2.HttpException;
 
 public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInterface, HomeV2InteractorInterface, PrivilegedGateway.PrivilegedGatewayDataObserver {
 
-    private static final long AUTO_DEBIT_RENEWAL_TIME_LIMIT_IN_DAYS = 30;
     private final HomeV2ContractInterface view;
     private final HomeV2GatewayInterface gateway;
     private final CompositeDisposable compositeDisposable;