diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1823aec3..a482c878 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c77..25e43cc7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,6 +8,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/SpinnerDatePickerLib-release" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 157815a3..b912bb7d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/gme-android.iml" filepath="$PROJECT_DIR$/gme-android.iml" />
     </modules>
diff --git a/SpinnerDatePickerLib-release.aar b/SpinnerDatePickerLib-release.aar
new file mode 100644
index 00000000..d1621e1f
Binary files /dev/null and b/SpinnerDatePickerLib-release.aar differ
diff --git a/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar b/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar
new file mode 100644
index 00000000..d1621e1f
Binary files /dev/null and b/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar differ
diff --git a/SpinnerDatePickerLib-release/build.gradle b/SpinnerDatePickerLib-release/build.gradle
new file mode 100644
index 00000000..99586f1e
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('SpinnerDatePickerLib-release.aar'))
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ebe6ba9e..0ae57dfe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-//    implementation 'com.github.yalantis:ucrop:2.2.2'
+    //    implementation 'com.github.yalantis:ucrop:2.2.2'
     implementation 'com.google.firebase:firebase-core:16.0.4'
     implementation 'com.google.firebase:firebase-messaging:17.3.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
@@ -106,23 +106,22 @@ dependencies {
     implementation 'com.leavjenn.smoothdaterangepicker:library:0.2.0'
     implementation 'com.github.kapilmhr:SizesDP:1.1'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
-//    implementation 'com.facebook.android:facebook-share:[4,5)'
+    //    implementation 'com.facebook.android:facebook-share:[4,5)'
     //    compile group: 'com.zendesk', name: 'sdk', version: '1.10.0.1'
-//    implementation 'joda-time:joda-time:2.9.9'
+    //    implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation 'id.zelory:compressor:2.1.0'
-
-//    implementation 'com.zxy.android:tiny:1.0.0'
-
+    //    implementation 'com.zxy.android:tiny:1.0.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.0'
-//    implementation 'org.greenrobot:eventbus:3.1.1'
+    //    implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.android.support:percent:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
+    implementation project(':SpinnerDatePickerLib-release')
 }
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java
index a612c538..71a53597 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java
@@ -71,6 +71,12 @@ public class TransactionHistoryRVAdapter extends RecyclerView.Adapter<Transactio
         }
     }
 
+    public void resetData()
+    {
+        this.transactionHistoryItemModels=null;
+        notifyDataSetChanged();
+    }
+
     public interface TransactionItemClickListener
     {
         void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel);
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
index fe644e52..58ff75d2 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
+import com.gmeremit.online.gmeremittance_native.registerV2.view.RegisterV2Activity;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2TransactionCompleteActivity;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryV2ActionListener;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryRVAdapter;
@@ -25,9 +26,15 @@ import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.T
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;
 import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment;
+import com.tsongkha.spinnerdatepicker.DatePicker;
+import com.tsongkha.spinnerdatepicker.DateRangePickerDialog;
+import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -143,7 +150,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
         transactionViewPager.addOnPageChangeListener(this);
 
-        transactionViewPager.setOffscreenPageLimit(2);
+        transactionViewPager.setOffscreenPageLimit(3);
 
         transactionViewPager.setAdapter(transactionHistoryViewPagerAdapter);
 
@@ -191,36 +198,107 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
     }
 
 
+//    private void promptCalendarPicker() {
+//        SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance(
+//                new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
+//                    @Override
+//                    public void onDateRangeSet(SmoothDateRangePickerFragment view,
+//                                               int yearStart, int monthStart,
+//                                               int dayStart, int yearEnd,
+//                                               int monthEnd, int dayEnd) {
+//
+//                        String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart);
+//                        String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd);
+//
+//
+//
+//
+//                        fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
+//                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
+//
+//                       presenter.getTransactionHistory(startDate,endDate);
+//
+//
+//                    if(dateContainer.getVisibility()!=View.VISIBLE)
+//                        dateContainer.setVisibility(View.VISIBLE);
+//                    }
+//                });
+//
+//
+//
+//        if(!smoothDateRangePickerFragment.isAdded())
+//        smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker");
+//    }
     private void promptCalendarPicker() {
-        SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance(
-                new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
+        new SpinnerDateRangePickerDialogBuilder()
+                .context(TransactionHistoryActivityV2.this)
+                .spinnerTheme(R.style.NumberPickerStyle)
+                .showTitle(true)
+                .showDaySpinner(true)
+                .defaultDate(1990, 0, 1)
+                .setCurrentDateAsMaxDate()
+                .minDate(2017,9,10)
+                .dialogTheme(R.style.DatePickerTheme)
+                .showTitle(true)
+                .setTitle("Filter by date")
+                .callback(new DateRangePickerDialog.OnRangeDateSetListener() {
+                    private String startDate="";
+                    private String endDate="";
                     @Override
-                    public void onDateRangeSet(SmoothDateRangePickerFragment view,
-                                               int yearStart, int monthStart,
-                                               int dayStart, int yearEnd,
-                                               int monthEnd, int dayEnd) {
-
-                        String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart);
-                        String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd);
-
-
-
-
+                    public void onFromDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
+                        startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth);
                         fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
-                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
+                    }
 
-                       presenter.getTransactionHistory(startDate,endDate);
+                    @Override
+                    public void onToDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
+                        endDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth);
+                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
 
 
-                    if(dateContainer.getVisibility()!=View.VISIBLE)
-                        dateContainer.setVisibility(View.VISIBLE);
                     }
-                });
-
 
+                    @Override
+                    public void onInvalidRangeSelected() {
+                        showToastMessage("Invalid date selected");
+                    }
 
-        if(!smoothDateRangePickerFragment.isAdded())
-        smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker");
+                    @Override
+                    public void onDateRangeReceivedSucess() {
+                        presenter.getTransactionHistory(startDate,endDate);
+                    }
+                })
+                .build()
+                .show();
+//        SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance(
+//                new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
+//                    @Override
+//                    public void onDateRangeSet(SmoothDateRangePickerFragment view,
+//                                               int yearStart, int monthStart,
+//                                               int dayStart, int yearEnd,
+//                                               int monthEnd, int dayEnd) {
+//
+//                        String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart);
+//                        String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd);
+//
+//
+//
+//
+//                        fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
+//                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
+//
+//                       presenter.getTransactionHistory(startDate,endDate);
+//
+//
+//                    if(dateContainer.getVisibility()!=View.VISIBLE)
+//                        dateContainer.setVisibility(View.VISIBLE);
+//                    }
+//                });
+//
+//
+//
+//        if(!smoothDateRangePickerFragment.isAdded())
+//        smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker");
     }
 
 
diff --git a/app/src/main/res/drawable/ic_date_picker_rd_background_white.xml b/app/src/main/res/drawable/ic_date_picker_rd_background_white.xml
new file mode 100644
index 00000000..af13b83c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_date_picker_rd_background_white.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetRight="10dp"
+    android:insetLeft="10dp">
+    <shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+        <solid android:color="@android:color/white"/>
+        <corners android:radius="12dp"/>
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4aaaa65f..042bc38f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -31,6 +31,32 @@
         <item name="android:windowBackground">@drawable/ic_rounded_white</item>
     </style>
 
+    <style name="NumberPickerStyle">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColorPrimary">@color/colorAccent</item>
+        <item name="android:colorControlNormal" tools:targetApi="lollipop">@color/gray</item>
+    </style>
+
+    <style name="DatePickerTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@android:color/black</item>
+        <item name="android:textColorPrimary">@color/darkgray</item>
+        <item name="android:windowBackground">@drawable/ic_date_picker_rd_background_white</item>
+        <item name="android:windowTitleStyle">@style/DatePickerDialogTitle</item>
+        <item name="android:buttonStyle">@style/DatePickerButtonStyle</item>
+    </style>
+
+    <style name="DatePickerDialogTitle" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textStyle">normal</item>
+
+    </style>
+
+    <style name="DatePickerButtonStyle">
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">@color/darkgray</item>
+
+        <item name="android:textStyle">normal</item>
+    </style>
 
 
 </resources>
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..b5040fe5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':SpinnerDatePickerLib-release'