From 47cd3998e661e6a9ddb6aa586108e36b6ff9cce0 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Fri, 5 Oct 2018 18:56:13 +0900 Subject: [PATCH] Verification Id Type Fixes --- .../homeV2/model/UserInfoModelV2.java | 2 +- .../homeV2/presenter/HomeV2Presenter.java | 2 +- .../kycV2/view/view2/KYCView2Fragment.java | 2 +- .../gmeremittance_native/loginV2/model/LoginModelV2.java | 2 +- .../presenter/TransactionHistoryV2Presenter.java | 5 ++++- .../presenter/WalletStatementV2Presenter.java | 8 ++++++-- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/UserInfoModelV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/UserInfoModelV2.java index 43994dd7..eb7f9261 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/UserInfoModelV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/UserInfoModelV2.java @@ -96,7 +96,7 @@ public class UserInfoModelV2 { @SerializedName("yearlyLimit") @Expose protected String yearlyLimit; - @SerializedName("Dob") + @SerializedName("dob") @Expose protected String userDob; @SerializedName("Data") diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java index 2d0377da..4469f15a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java @@ -144,7 +144,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt String message=""; String title=""; - userState=new UserState(userInfoModelV2.getKyc(),userInfoModelV2.getVerified(),userInfoModelV2.getEmail(),null); + userState=new UserState(userInfoModelV2.getKyc(),userInfoModelV2.getVerified(),userInfoModelV2.getEmail(),userInfoModelV2.getUserDob()); boolean disableKYCViewClick=userInfoModelV2.getKyc()&&!userInfoModelV2.getVerified(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java index 5b599c48..503e44ec 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java @@ -240,7 +240,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen if(splittedDate.length!=3) return null; - return splittedDate[0].substring(2,3)+splittedDate[1]+splittedDate[2]; + return splittedDate[0].substring(2,4)+splittedDate[1]+splittedDate[2]; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/model/LoginModelV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/model/LoginModelV2.java index 17857067..ddef785b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/model/LoginModelV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/model/LoginModelV2.java @@ -95,7 +95,7 @@ public class LoginModelV2 { @SerializedName("yearlyLimit") @Expose protected String yearlyLimit; - @SerializedName("Dob") + @SerializedName("dob") @Expose protected String userDob; @SerializedName("Data") diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java index 4216505c..10724c0b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java @@ -10,6 +10,7 @@ import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import io.reactivex.Observable; @@ -50,7 +51,9 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran List deliveredData=new ArrayList<>(); List sentData=new ArrayList<>(); - for(TransactionHistoryItemModel item:response.getTransactionHistoryItemModels()) + Collections.reverse(response.getTransactionHistoryItemModels()); + + for(TransactionHistoryItemModel item:response.getTransactionHistoryItemModels() ) { if(item.getPayStatus().equalsIgnoreCase("Paid")) deliveredData.add(item); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/presenter/WalletStatementV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/presenter/WalletStatementV2Presenter.java index 7b2f3cad..b4a631e6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/presenter/WalletStatementV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatement/presenter/WalletStatementV2Presenter.java @@ -8,6 +8,8 @@ import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverRe import com.gmeremit.online.gmeremittance_native.walletstatement.gateway.WalletStatmentV2Gateway; import com.gmeremit.online.gmeremittance_native.walletstatement.model.WalletStatementV2APIResponse; +import java.util.Collections; + import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; @@ -49,8 +51,10 @@ public class WalletStatementV2Presenter extends BasePresenter implements WalletS protected void onSuccess(WalletStatementV2APIResponse walletStatementV2APIResponse) { if(walletStatementV2APIResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { - if(walletStatementV2APIResponse.getTransactionHistoryItemModels()!=null&&walletStatementV2APIResponse.getTransactionHistoryItemModels().size()>0) - view.updateWalletStatement(walletStatementV2APIResponse.getTransactionHistoryItemModels()); + if(walletStatementV2APIResponse.getTransactionHistoryItemModels()!=null&&walletStatementV2APIResponse.getTransactionHistoryItemModels().size()>0) { + Collections.reverse(walletStatementV2APIResponse.getTransactionHistoryItemModels()); + view.updateWalletStatement(walletStatementV2APIResponse.getTransactionHistoryItemModels()); + } else view.showNoWalletStatmentFound(); }