From 80c8cd0fdae1a5ebe4c79fcefe9d136f01a2f623 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 30 Dec 2024 05:49:00 -0800
Subject: [PATCH] feat(voting): improve voting button and grouping by date
 (#1335)

* feat: add voting period ends improvements

* feat: use thumbs up/down logos instead

* fix: crash on empty list

* fix: update sorting to match user selection

* feat: improve sorting

* fix: prevent crash after view destroyed

* chore: cleanup and add license
---
 wallet/res/drawable/ic_thumb_down_red.xml     |  25 +++
 wallet/res/drawable/ic_thumb_down_white.xml   |  25 +++
 wallet/res/drawable/ic_thumb_up_blue.xml      |  25 +++
 wallet/res/drawable/ic_thumb_up_white.xml     |  25 +++
 .../dialog_username_request_filters.xml       |  28 +++
 .../fragment_username_request_details.xml     |  24 +++
 .../res/layout/username_request_date_view.xml |  37 ++++
 .../layout/username_request_group_view.xml    |  57 ++++--
 wallet/res/layout/username_request_view.xml   |  25 ++-
 wallet/res/navigation/nav_voting.xml          |   4 +
 wallet/res/values/strings-dashpay.xml         |  25 +--
 .../wallet/database/dao/UsernameRequestDao.kt |   3 +
 .../UsernameRequestDetailsFragment.kt         |   8 +
 .../username/UsernameRequestFilterDialog.kt   |  50 +++++-
 .../ui/username/UsernameRequestsFragment.kt   |  42 ++++-
 .../ui/username/UsernameRequestsViewModel.kt  |  59 +++++-
 .../adapters/UsernameRequestGroupAdapter.kt   | 168 +++++++++++++-----
 .../adapters/UsernameRequestGroupView.kt      |  22 ++-
 .../voting/RequestUserNameViewModel.kt        |   6 +
 .../voting/VotingRequestDetailsFragment.kt    |  65 ++++---
 20 files changed, 594 insertions(+), 129 deletions(-)
 create mode 100644 wallet/res/drawable/ic_thumb_down_red.xml
 create mode 100644 wallet/res/drawable/ic_thumb_down_white.xml
 create mode 100644 wallet/res/drawable/ic_thumb_up_blue.xml
 create mode 100644 wallet/res/drawable/ic_thumb_up_white.xml
 create mode 100644 wallet/res/layout/username_request_date_view.xml

diff --git a/wallet/res/drawable/ic_thumb_down_red.xml b/wallet/res/drawable/ic_thumb_down_red.xml
new file mode 100644
index 0000000000..3ca1632e87
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_down_red.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.123,0.744H3.823C2.813,0.744 1.953,1.434 1.733,2.454L0.763,8.554C0.663,9.164 0.843,9.784 1.243,10.254C1.643,10.724 2.233,10.994 2.853,10.994H6.103V12.464C6.083,13.184 6.293,13.874 6.713,14.464C7.063,14.964 7.623,15.254 8.223,15.254C8.273,15.254 8.313,15.254 8.363,15.254C9.013,15.204 9.583,14.824 9.883,14.244L11.913,10.214C11.974,10.084 12.113,10.004 12.253,10.004H14.144C15.314,10.004 16.264,9.054 16.264,7.884V2.864C16.264,1.694 15.314,0.744 14.144,0.744H14.123ZM10.774,9.644L8.743,13.674C8.603,13.944 8.353,13.994 8.253,14.004C8.143,14.004 7.893,14.004 7.723,13.754C7.463,13.374 7.323,12.934 7.333,12.474L7.353,10.374C7.353,10.204 7.293,10.044 7.173,9.924C7.053,9.804 6.893,9.734 6.733,9.734H2.853C2.593,9.734 2.363,9.624 2.193,9.434C2.033,9.244 1.953,8.984 1.993,8.734L2.953,2.674C3.043,2.274 3.403,1.984 3.813,1.984H11.253V9.074C11.054,9.224 10.884,9.404 10.774,9.634V9.644ZM14.983,7.874C14.983,8.354 14.594,8.744 14.113,8.744H12.503V1.994H14.113C14.594,1.994 14.983,2.384 14.983,2.864V7.884V7.874Z"
+      android:fillColor="#EA3943"/>
+</vector>
diff --git a/wallet/res/drawable/ic_thumb_down_white.xml b/wallet/res/drawable/ic_thumb_down_white.xml
new file mode 100644
index 0000000000..8156ea16af
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_down_white.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.123,0.744H3.823C2.813,0.744 1.953,1.434 1.733,2.454L0.763,8.554C0.663,9.164 0.843,9.784 1.243,10.254C1.643,10.724 2.233,10.994 2.853,10.994H6.103V12.464C6.083,13.184 6.293,13.874 6.713,14.464C7.063,14.964 7.623,15.254 8.223,15.254C8.273,15.254 8.313,15.254 8.363,15.254C9.013,15.204 9.583,14.824 9.883,14.244L11.913,10.214C11.974,10.084 12.113,10.004 12.253,10.004H14.144C15.314,10.004 16.264,9.054 16.264,7.884V2.864C16.264,1.694 15.314,0.744 14.144,0.744H14.123ZM10.774,9.644L8.743,13.674C8.603,13.944 8.353,13.994 8.253,14.004C8.143,14.004 7.893,14.004 7.723,13.754C7.463,13.374 7.323,12.934 7.333,12.474L7.353,10.374C7.353,10.204 7.293,10.044 7.173,9.924C7.053,9.804 6.893,9.734 6.733,9.734H2.853C2.593,9.734 2.363,9.624 2.193,9.434C2.033,9.244 1.953,8.984 1.993,8.734L2.953,2.674C3.043,2.274 3.403,1.984 3.813,1.984H11.253V9.074C11.054,9.224 10.884,9.404 10.774,9.634V9.644ZM14.983,7.874C14.983,8.354 14.594,8.744 14.113,8.744H12.503V1.994H14.113C14.594,1.994 14.983,2.384 14.983,2.864V7.884V7.874Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/wallet/res/drawable/ic_thumb_up_blue.xml b/wallet/res/drawable/ic_thumb_up_blue.xml
new file mode 100644
index 0000000000..55dec1e2d7
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_up_blue.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M2.877,15.256H13.177C14.186,15.256 15.047,14.566 15.267,13.546L16.236,7.446C16.337,6.836 16.156,6.216 15.757,5.746C15.356,5.276 14.767,5.006 14.146,5.006H10.896V3.536C10.917,2.816 10.707,2.126 10.286,1.536C9.937,1.036 9.377,0.746 8.777,0.746C8.727,0.746 8.687,0.746 8.637,0.746C7.987,0.796 7.417,1.176 7.117,1.756L5.087,5.786C5.027,5.916 4.887,5.996 4.747,5.996H2.857C1.687,5.996 0.737,6.946 0.737,8.116V13.136C0.737,14.306 1.687,15.256 2.857,15.256H2.877ZM6.227,6.356L8.257,2.326C8.397,2.056 8.647,2.006 8.747,1.996C8.857,1.996 9.107,1.996 9.277,2.246C9.537,2.626 9.677,3.066 9.667,3.526L9.647,5.626C9.647,5.796 9.707,5.956 9.827,6.076C9.947,6.196 10.106,6.266 10.267,6.266H14.146C14.406,6.266 14.637,6.376 14.807,6.566C14.967,6.756 15.047,7.016 15.007,7.266L14.047,13.326C13.957,13.726 13.597,14.016 13.186,14.016H5.747V6.926C5.947,6.776 6.117,6.596 6.227,6.366V6.356ZM2.017,8.126C2.017,7.646 2.407,7.256 2.887,7.256H4.497V14.006H2.887C2.407,14.006 2.017,13.616 2.017,13.136V8.116V8.126Z"
+      android:fillColor="#008DE4"/>
+</vector>
diff --git a/wallet/res/drawable/ic_thumb_up_white.xml b/wallet/res/drawable/ic_thumb_up_white.xml
new file mode 100644
index 0000000000..a22d1332fc
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_up_white.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M2.877,15.256H13.177C14.186,15.256 15.047,14.566 15.267,13.546L16.236,7.446C16.337,6.836 16.156,6.216 15.757,5.746C15.356,5.276 14.767,5.006 14.146,5.006H10.896V3.536C10.917,2.816 10.707,2.126 10.286,1.536C9.937,1.036 9.377,0.746 8.777,0.746C8.727,0.746 8.687,0.746 8.637,0.746C7.987,0.796 7.417,1.176 7.117,1.756L5.087,5.786C5.027,5.916 4.887,5.996 4.747,5.996H2.857C1.687,5.996 0.737,6.946 0.737,8.116V13.136C0.737,14.306 1.687,15.256 2.857,15.256H2.877ZM6.227,6.356L8.257,2.326C8.397,2.056 8.647,2.006 8.747,1.996C8.857,1.996 9.107,1.996 9.277,2.246C9.537,2.626 9.677,3.066 9.667,3.526L9.647,5.626C9.647,5.796 9.707,5.956 9.827,6.076C9.947,6.196 10.106,6.266 10.267,6.266H14.146C14.406,6.266 14.637,6.376 14.807,6.566C14.967,6.756 15.047,7.016 15.007,7.266L14.047,13.326C13.957,13.726 13.597,14.016 13.186,14.016H5.747V6.926C5.947,6.776 6.117,6.596 6.227,6.366V6.356ZM2.017,8.126C2.017,7.646 2.407,7.256 2.887,7.256H4.497V14.006H2.887C2.407,14.006 2.017,13.616 2.017,13.136V8.116V8.126Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/wallet/res/layout/dialog_username_request_filters.xml b/wallet/res/layout/dialog_username_request_filters.xml
index 7f5c0b87d7..6b25ae8c80 100644
--- a/wallet/res/layout/dialog_username_request_filters.xml
+++ b/wallet/res/layout/dialog_username_request_filters.xml
@@ -66,12 +66,40 @@
         android:layout_marginTop="5dp"
         app:layout_constraintTop_toBottomOf="@id/header">
 
+
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:orientation="vertical"
             android:paddingHorizontal="15dp">
+            <TextView
+                android:id="@+id/group_by_label"
+                style="@style/Caption.Medium.Tertiary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:text="@string/group_by" />
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_by_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:cardBackgroundColor="@color/background_secondary"
+                app:cardCornerRadius="10dp"
+                app:cardElevation="0dp">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/group_by_filter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:itemCount="2"
+                    tools:listitem="@layout/radiobutton_row" />
+            </androidx.cardview.widget.CardView>
 
             <TextView
                 android:id="@+id/sort_by_label"
diff --git a/wallet/res/layout/fragment_username_request_details.xml b/wallet/res/layout/fragment_username_request_details.xml
index ee8f7b9517..8da8332864 100644
--- a/wallet/res/layout/fragment_username_request_details.xml
+++ b/wallet/res/layout/fragment_username_request_details.xml
@@ -114,6 +114,30 @@
                 android:layout_marginTop="2dp"
                 tools:text="90f95ff7bc2438a748dc8470255b888b2a9ea6837bf518d018dc3d6cddf698" />
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="14dp"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="10dp"
+            android:background="@drawable/rounded_background"
+            android:theme="@style/GrayPanelBackground">
+
+            <TextView
+                style="@style/Overline.Secondary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/voting_period" />
+
+            <TextView
+                android:id="@+id/voting_period"
+                style="@style/Body2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                tools:text="2024 Dec 1 to 2014 Dec 15" />
+        </LinearLayout>
     </LinearLayout>
 
     <FrameLayout
diff --git a/wallet/res/layout/username_request_date_view.xml b/wallet/res/layout/username_request_date_view.xml
new file mode 100644
index 0000000000..7991509a40
--- /dev/null
+++ b/wallet/res/layout/username_request_date_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="36dp"
+    tools:context="de.schildbach.wallet.ui.username.adapters.DateViewHolder">
+
+    <TextView
+        android:id="@+id/date_heading"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAlignment="center"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:maxLines="1"
+        android:ellipsize="middle"
+        tools:text="Voting period ends in 14 days"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index 7d21e9eab8..e0e284c1eb 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -62,7 +62,7 @@
         android:id="@+id/link_included"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="link included"
+        android:text="@string/link_included"
         style="@style/Caption.Blue"
         app:layout_constraintTop_toTopOf="@id/link_badge"
         app:layout_constraintStart_toEndOf="@id/link_badge" />
@@ -79,32 +79,61 @@
         app:layout_constraintBottom_toBottomOf="@id/username"
         tools:text="4 requests" />
 
-    <Button
-        android:id="@+id/blocks_button"
+    <LinearLayout
+        android:id="@+id/blocks_button_container"
         style="@style/Button.Primary.Large.LightRed"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginVertical="5dp"
         android:layout_marginHorizontal="8dp"
-        app:layout_constraintEnd_toStartOf="@id/approvals_button"
+        android:layout_marginVertical="5dp"
+        app:layout_constraintEnd_toStartOf="@id/approvals_button_container"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="1\nBlock"
-        />
+        tools:text="2" >
+        <TextView
+            android:id="@+id/blocks_button_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/system_red"
+            android:textSize="12sp"
+            tools:text="2"
+            />
+        <ImageView
+            android:id="@+id/blocks_button_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:src="@drawable/ic_thumb_down_red"
+            />
+    </LinearLayout>
 
-    <Button
-        android:id="@+id/approvals_button"
+    <LinearLayout
+        android:id="@+id/approvals_button_container"
         style="@style/Button.Primary.Large.LightBlue"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginVertical="5dp"
-        android:layout_marginHorizontal="10dp"
-        app:layout_constraintEnd_toStartOf="@id/chevron"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="3\nApprovals"
-        />
-
+        tools:text="2" >
+        <TextView
+            android:id="@+id/approvals_button_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/dash_blue"
+            android:textSize="12sp"
+            tools:text="2"
+            />
+        <ImageView
+            android:id="@+id/approvals_button_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:src="@drawable/ic_thumb_up_blue"
+            />
+    </LinearLayout>
     <ImageView
         android:id="@+id/chevron"
         android:layout_width="11dp"
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index 884bca2550..0e413d31e7 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -63,13 +63,13 @@
             android:id="@+id/link_included"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="link included"
+            android:text="@string/link_included"
             style="@style/Caption.Blue"
             app:layout_constraintTop_toTopOf="@id/link_badge"
             app:layout_constraintStart_toEndOf="@id/link_badge" />
 
-        <Button
-            android:id="@+id/approvals_button"
+        <LinearLayout
+            android:id="@+id/approvals_button_container"
             style="@style/Button.Primary.Large.LightBlue"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -78,8 +78,23 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/info"
             app:layout_constraintBottom_toBottomOf="@id/info"
-            tools:text="2\nApprovals"
-            />
+            tools:text="2" >
+            <TextView
+                android:id="@+id/approvals_button_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/dash_blue"
+                android:textSize="12sp"
+                tools:text="2"
+                />
+            <ImageView
+                android:id="@+id/approvals_button_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:src="@drawable/ic_thumb_up_blue"
+                />
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/navigation/nav_voting.xml b/wallet/res/navigation/nav_voting.xml
index f05381875a..7a557d922c 100644
--- a/wallet/res/navigation/nav_voting.xml
+++ b/wallet/res/navigation/nav_voting.xml
@@ -74,6 +74,10 @@
             android:name="requestId"
             app:argType="string" />
 
+        <argument
+            android:name="startDate"
+            app:argType="long" />
+
         <action
             android:id="@+id/details_to_votingKeyInput"
             app:destination="@id/votingKeyInputFragment"
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 1d095b7dc0..148e4af5dc 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -280,8 +280,15 @@
     <string name="only_duplicates">Only duplicates</string>
     <string name="only_links">Only requests with links</string>
     <string name="only_links_short">With links</string>
-    <string name="date">Date: %s</string>
+    <string name="date">Request Date: %s</string>
     <string name="votes">Votes: %s</string>
+    <string name="voting_ends">Voting ends: %s</string>
+
+    <string-array name="usernames_group_by_options">
+        <item>None</item>
+        <item>Soonest first</item>
+        <item>Latest first</item>
+    </string-array>
 
     <string-array name="usernames_sort_by_options">
         <item>New to old</item>
@@ -296,16 +303,6 @@
         <item>I have not approved</item>
         <item>Has Blocked votes</item>
     </string-array>
-    <string name="unblock_button">Unblock</string>
-    <plurals name="block_vote_button">
-        <item quantity="one">Block</item>
-        <item quantity="other">Blocks</item>
-    </plurals>
-    <plurals name="approval_button">
-        <item quantity="one">Approval</item>
-        <item quantity="other">Approvals</item>
-    </plurals>
-    <string name="block_vote_count">%d Block(s)</string>
     <string name="request_your_username">Create your username</string>
     <string name="request_your_hint">Please note that you will not be able to change it in the future</string>
     <string name="request_username">Request Username</string>
@@ -452,4 +449,10 @@
     <string name="mix_dash_message">To help prevent other people from seeing who you make payments to, it is recommended to mix your balance before you create your username.</string>
     <string name="dash_private_key_mainnet" translatable="false">XKm5koXHMm7UrVV3ki2pbGA8yZztiSR2F9x6ucEyCSuqTHBMjJix</string>
     <string name="dash_private_key_testnet" translatable="false">cUR2TrX4U6t6g9kRfDoBbwF2WRKBNjV3gK7HwTgQgmUUQCKXcT3N</string>
+    <string name="voting_period">Voting Period</string>
+    <string name="voting_period_ends_in_days">Voting ends in %d days</string>
+    <string name="voting_period_ends_today">Voting ends today</string>
+    <string name="voting_period_ends_tomorrow">Voting ends tomorrow</string>
+    <string name="link_included">link included</string>
+    <string name="group_by">Group by</string>
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
index b42a0c7092..6d8ac770ea 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
@@ -35,6 +35,9 @@ interface UsernameRequestDao {
     @Query("SELECT * FROM username_requests WHERE requestId = :requestId")
     suspend fun getRequest(requestId: String): UsernameRequest?
 
+    @Query("SELECT * FROM username_requests WHERE normalizedLabel = :normalizedLabel")
+    suspend fun getRequestsByNormalizedLabel(normalizedLabel: String): List<UsernameRequest>
+
     @Query("SELECT * FROM username_requests WHERE requestId = :requestId")
     fun observeRequest(requestId: String): Flow<UsernameRequest?>
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index 8a2827652b..fa51aa890c 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -1,6 +1,7 @@
 package de.schildbach.wallet.ui.username
 
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -92,6 +93,13 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                     }
                 }
             }
+            val votingPeriod = args.startDate.let { startTime ->
+                val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
+                val dateFormat = DateFormat.getMediumDateFormat(requireContext())
+                String.format("%s - %s", dateFormat.format(startTime), dateFormat.format(endTime))
+            }
+
+            binding.votingPeriod.text = votingPeriod
         }
 
         viewModel.selectUsernameRequest(args.requestId)
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
index 7b38e7feb6..0913f2f4be 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
@@ -29,6 +29,16 @@ import org.dash.wallet.common.ui.radio_group.RadioGroupAdapter
 import org.dash.wallet.common.ui.radio_group.setupRadioGroup
 import org.dash.wallet.common.ui.viewBinding
 
+enum class UsernameGroupOption {
+    VotingPeriodNone,
+    VotingPeriodSoonest,
+    VotingPeriodLatest;
+
+    companion object {
+        val defaultOption = VotingPeriodSoonest
+    }
+}
+
 enum class UsernameSortOption {
     DateDescending,
     DateAscending,
@@ -36,7 +46,7 @@ enum class UsernameSortOption {
     VotesAscending;
 
     companion object {
-        val defaultOption = DateDescending
+        val defaultOption = DateAscending
     }
 }
 
@@ -60,6 +70,7 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
 
     private lateinit var typeOptionsAdapter: RadioGroupAdapter
     private lateinit var sortByOptionsAdapter: RadioGroupAdapter
+    private lateinit var groupByOptionsAdapter: RadioGroupAdapter
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -81,17 +92,37 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
     }
 
     private fun setupSortByOptions() {
-        val optionNames = binding.root.resources.getStringArray(R.array.usernames_sort_by_options).mapIndexed { i, it ->
+
+        val sortByOptionNames = binding.root.resources.getStringArray(R.array.usernames_sort_by_options).mapIndexed { i, it ->
             IconifiedViewItem(getString(if (i < 2) R.string.date else R.string.votes, it))
         }
 
+        val groupByOptionNames = binding.root.resources.getStringArray(R.array.usernames_group_by_options).mapIndexed { i, it ->
+            IconifiedViewItem(
+                if (i == 0) {
+                    it
+                } else {
+                    getString(R.string.voting_ends, it)
+                }
+            )
+        }
+
+        val groupOption = viewModel.filterState.value.groupByOption
+        val initialGroupIndex = UsernameGroupOption.entries.indexOf(groupOption)
+        val groupAdapter = RadioGroupAdapter(initialGroupIndex) { _, _ ->
+            checkResetButton()
+        }
+        binding.groupByFilter.setupRadioGroup(groupAdapter)
+        groupAdapter.submitList(groupByOptionNames)
+        groupByOptionsAdapter = groupAdapter
+
         val sortOption = viewModel.filterState.value.sortByOption
-        val initialIndex = UsernameSortOption.values().indexOf(sortOption)
+        val initialIndex = UsernameSortOption.entries.indexOf(sortOption)
         val adapter = RadioGroupAdapter(initialIndex) { _, _ ->
             checkResetButton()
         }
         binding.sortByFilter.setupRadioGroup(adapter)
-        adapter.submitList(optionNames)
+        adapter.submitList(sortByOptionNames)
         sortByOptionsAdapter = adapter
     }
 
@@ -116,18 +147,20 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
     }
 
     private fun applyFilters() {
-        val sortByOption = UsernameSortOption.values()[sortByOptionsAdapter.selectedIndex]
-        val typeOption = UsernameTypeOption.values()[typeOptionsAdapter.selectedIndex]
+        val groupByOption = UsernameGroupOption.entries[groupByOptionsAdapter.selectedIndex]
+        val sortByOption = UsernameSortOption.entries[sortByOptionsAdapter.selectedIndex]
+        val typeOption = UsernameTypeOption.entries[typeOptionsAdapter.selectedIndex]
         val onlyDuplicates = binding.onlyDuplicatesCheckbox.isChecked
         val onlyLinks = binding.onlyLinksCheckbox.isChecked
 
-        viewModel.applyFilters(sortByOption, typeOption, onlyDuplicates, onlyLinks)
+        viewModel.applyFilters(groupByOption, sortByOption, typeOption, onlyDuplicates, onlyLinks)
     }
 
     private fun checkResetButton() {
         var isEnabled = false
 
-        if (sortByOptionsAdapter.selectedIndex != UsernameSortOption.defaultOption.ordinal ||
+        if (groupByOptionsAdapter.selectedIndex != UsernameGroupOption.defaultOption.ordinal ||
+            sortByOptionsAdapter.selectedIndex != UsernameSortOption.defaultOption.ordinal ||
             typeOptionsAdapter.selectedIndex != UsernameTypeOption.defaultOption.ordinal
         ) {
             isEnabled = true
@@ -145,6 +178,7 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
     }
 
     private fun resetFilters() {
+        groupByOptionsAdapter.selectedIndex = UsernameGroupOption.defaultOption.ordinal
         sortByOptionsAdapter.selectedIndex = UsernameSortOption.defaultOption.ordinal
         typeOptionsAdapter.selectedIndex = UsernameTypeOption.defaultOption.ordinal
         binding.onlyDuplicatesCheckbox.isChecked = true
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 0bda5358da..e0f9e83608 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewTreeObserver
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -31,14 +32,18 @@ import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.livedata.Status
 import de.schildbach.wallet.ui.dashpay.work.BroadcastUsernameVotesWorker
+import de.schildbach.wallet.ui.main.HistoryRowView
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupAdapter
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupView
+import de.schildbach.wallet.ui.username.adapters.UsernameRequestRowView
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet.ui.username.voting.OneVoteLeftDialogFragment
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentUsernameRequestsBinding
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
@@ -50,6 +55,8 @@ import org.dashj.platform.dpp.voting.LockVoteChoice
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
 import org.dashj.platform.dpp.voting.TowardsIdentity
 import org.slf4j.LoggerFactory
+import java.time.Instant
+import java.time.ZoneId
 
 @AndroidEntryPoint
 class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
@@ -79,7 +86,10 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                 lifecycleScope.launch {
                     if (request.requestId != "") {
                         viewModel.logEvent(AnalyticsConstants.UsernameVoting.DETAILS)
-                        safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId))
+                        val votingStartDate = withContext(Dispatchers.IO) {
+                            viewModel.getVotingStartDate(request.normalizedLabel)
+                        }
+                        safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId, votingStartDate))
                     } else {
                         performVote(request)
                     }
@@ -326,7 +336,18 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         val list = filterByQuery(itemList, binding.search.text.toString())
         val layoutManager = binding.requestGroups.layoutManager as LinearLayoutManager
         val scrollPosition = layoutManager.findFirstVisibleItemPosition()
-        adapter.submitList(list)
+        val listForAdapter = if (list.isNotEmpty() && viewModel.filterState.value.groupByOption != UsernameGroupOption.VotingPeriodNone) {
+            list.groupBy {
+                Instant.ofEpochMilli(it.votingEndDate).atZone(ZoneId.systemDefault()).toLocalDate()
+            }.map {
+                val outList = mutableListOf<UsernameRequestRowView>()
+                outList.add(UsernameRequestRowView(it.key))
+                outList.apply { addAll(it.value) }
+            }.reduce { acc, list -> acc.apply { addAll(list) } }
+        } else {
+            requests
+        }
+        adapter.submitList(listForAdapter)
         binding.requestGroups.scrollToPosition(scrollPosition)
     }
 
@@ -430,14 +451,17 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             .start()
 
         viewModel.voteHandled()
+        // replace with our custom toast?
         binding.voteSubmittedIndicator.postDelayed({
-            binding.voteSubmittedIndicator.animate()
-                .alpha(0f)
-                .setDuration(animationDuration)
-                .withEndAction {
-                    binding.voteSubmittedIndicator.isVisible = false
-                }
-                .start()
+            if (isAdded && viewLifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                binding.voteSubmittedIndicator.animate()
+                    .alpha(0f)
+                    .setDuration(animationDuration)
+                    .withEndAction {
+                        binding.voteSubmittedIndicator.isVisible = false
+                    }
+                    .start()
+            }
         }, 3000L)
     }
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index e792516c60..0e114c1c01 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -41,6 +41,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
@@ -56,13 +57,8 @@ import org.bitcoinj.core.Base58
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.core.ECKey
 import org.bitcoinj.core.KeyId
-import org.bitcoinj.core.MasternodeAddress
-import org.bitcoinj.core.NetworkParameters
 import org.bitcoinj.core.Sha256Hash
 import org.bitcoinj.core.Utils
-import org.bitcoinj.crypto.BLSLazyPublicKey
-import org.bitcoinj.crypto.BLSPublicKey
-import org.bitcoinj.evolution.SimplifiedMasternodeListEntry
 import org.bitcoinj.evolution.SimplifiedMasternodeListManager
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.authentication.AuthenticationKeyStatus
@@ -102,6 +98,7 @@ data class UsernameRequestsUIState(
 )
 
 data class FiltersUIState(
+    val groupByOption: UsernameGroupOption = UsernameGroupOption.defaultOption,
     val sortByOption: UsernameSortOption = UsernameSortOption.defaultOption,
     val typeOption: UsernameTypeOption = UsernameTypeOption.defaultOption,
     val onlyDuplicates: Boolean = true,
@@ -189,8 +186,48 @@ class UsernameRequestsViewModel @Inject constructor(
                                     }?.username?.lowercase() ?: list[0].username
                                 }
                             }
-                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(prettyUsername), votes)
-                        }.filterNot { it.requests.isEmpty() }
+                            val votingEndDate = if (sortedList.isNotEmpty()) {
+                                sortedList.minOf { request -> request.createdAt } + UsernameRequest.VOTING_PERIOD_MILLIS
+                            } else {
+                                -1L
+                            }
+                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(prettyUsername), votes, votingEndDate)
+                        }.filterNot { it.requests.isEmpty() && it.votingEndDate < System.currentTimeMillis() }
+                }.map { groupViews -> // Sort the list emitted by the Flow
+                    when (_filterState.value.groupByOption) {
+                        UsernameGroupOption.VotingPeriodSoonest -> groupViews.sortedWith(
+                            when (_filterState.value.sortByOption) {
+                                UsernameSortOption.DateAscending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenBy { group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.DateDescending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.VotesAscending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenBy {  group -> group.requests.maxOf { request -> request.votes } }
+                                UsernameSortOption.VotesDescending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.maxOf { request -> request.votes } }
+                            }
+                        )
+                        UsernameGroupOption.VotingPeriodLatest -> groupViews.sortedWith(
+                            when (_filterState.value.sortByOption) {
+                                UsernameSortOption.DateAscending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenBy { group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.DateDescending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.VotesAscending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenBy {  group -> group.requests.maxOf { request -> request.votes } }
+                                UsernameSortOption.VotesDescending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.maxOf { request -> request.votes } }
+                            }
+                        )
+                        else -> {
+                            when (_filterState.value.sortByOption) {
+                                UsernameSortOption.DateAscending -> groupViews.sortedBy {
+                                    it.requests.minOf { request -> request.createdAt }
+                                }
+                                UsernameSortOption.DateDescending -> groupViews.sortedByDescending {
+                                    it.requests.minOf { request -> request.createdAt }
+                                }
+                                UsernameSortOption.VotesAscending -> groupViews.sortedBy {
+                                    it.requests.maxOf { request -> request.votes }
+                                }
+                                UsernameSortOption.VotesDescending -> groupViews.sortedByDescending {
+                                    it.requests.maxOf { request -> request.votes }
+                                }
+                            }
+                        }
+                    }
                 }
         }.onEach { requests -> _uiState.update { it.copy(filteredUsernameRequests = requests) } }
             .launchIn(viewModelWorkerScope)
@@ -245,6 +282,7 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     fun applyFilters(
+        groupByOption: UsernameGroupOption,
         sortByOption: UsernameSortOption,
         typeOption: UsernameTypeOption,
         onlyDuplicates: Boolean,
@@ -252,6 +290,7 @@ class UsernameRequestsViewModel @Inject constructor(
     ) {
         _filterState.update {
             it.copy(
+                groupByOption = groupByOption,
                 sortByOption = sortByOption,
                 typeOption = typeOption,
                 onlyDuplicates = onlyDuplicates,
@@ -714,4 +753,10 @@ class UsernameRequestsViewModel @Inject constructor(
     suspend fun isImported(masternode: ImportedMasternodeKey): Boolean {
         return importedMasternodeKeyDao.contains(masternode.proTxHash)
     }
+
+    suspend fun getVotingStartDate(normalizedLabel: String): Long {
+        return usernameRequestDao.getRequestsByNormalizedLabel(normalizedLabel).minOf {
+            it.createdAt
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
index cb59a1c2e1..d50a13b160 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -16,12 +16,14 @@
  */
 package de.schildbach.wallet.ui.username.adapters
 
-import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_SP
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
@@ -30,11 +32,14 @@ import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet_test.R
+import de.schildbach.wallet_test.databinding.UsernameRequestDateViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestGroupViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestViewBinding
 import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dashj.platform.sdk.platform.Names
 import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.temporal.ChronoUnit
 
 import java.util.Date
 import java.util.Locale
@@ -48,52 +53,122 @@ fun Button.setVoteThemeColors(
     setTextSize(COMPLEX_UNIT_SP, 12.0f)
 }
 
+private fun setVoteThemeColors(
+    button: LinearLayout,
+    textView: TextView,
+    imageView: ImageView,
+    backgroundStyle: Int,
+    textColor: Int,
+    iconResource: Int
+) {
+    button.setRoundedRippleBackground(backgroundStyle)
+    textView.setTextColor(textView.context.getColor(textColor))
+    textView.setTextSize(COMPLEX_UNIT_SP, 12.0f)
+    imageView.setImageResource(iconResource)
+}
+
 class UsernameRequestGroupAdapter(
     private val usernameDetailsClickListener: (UsernameRequest) -> Unit,
     private val voteClickListener: (UsernameRequest) -> Unit
-): ListAdapter<UsernameRequestGroupView, UsernameRequestGroupViewHolder>(
+): ListAdapter<UsernameRequestRowView, AbstractUsernameRequestGroupViewHolder>(
     DiffCallback()
 ) {
-    class DiffCallback : DiffUtil.ItemCallback<UsernameRequestGroupView>() {
-        override fun areItemsTheSame(oldItem: UsernameRequestGroupView, newItem: UsernameRequestGroupView): Boolean {
-            return oldItem.username == newItem.username
+    companion object {
+        private const val DATE_TYPE = 0
+        private const val GROUP_TYPE = 1
+    }
+    class DiffCallback : DiffUtil.ItemCallback<UsernameRequestRowView>() {
+        override fun areItemsTheSame(oldItem: UsernameRequestRowView, newItem: UsernameRequestRowView): Boolean {
+            return oldItem is UsernameRequestGroupView &&
+                    newItem is UsernameRequestGroupView &&
+                    oldItem.username == newItem.username || oldItem.localDate == newItem.localDate
         }
 
-        override fun areContentsTheSame(oldItem: UsernameRequestGroupView, newItem: UsernameRequestGroupView): Boolean {
+        override fun areContentsTheSame(oldItem: UsernameRequestRowView, newItem: UsernameRequestRowView): Boolean {
             return oldItem == newItem
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UsernameRequestGroupViewHolder {
-        val binding = UsernameRequestGroupViewBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
+    override fun getItemViewType(position: Int): Int {
+        return when {
+            currentList[position] is UsernameRequestGroupView -> GROUP_TYPE
+            else -> DATE_TYPE
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractUsernameRequestGroupViewHolder {
+        return when (viewType) {
+            GROUP_TYPE -> {
+                val binding = UsernameRequestGroupViewBinding.inflate(
 
-        return UsernameRequestGroupViewHolder(binding)
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+                UsernameRequestGroupViewHolder(binding)
+            }
+
+            DATE_TYPE -> {
+                val binding = UsernameRequestDateViewBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+                DateViewHolder(binding)
+            }
+            else -> error("unknown viewType $viewType")
+        }
     }
 
-    override fun onBindViewHolder(holder: UsernameRequestGroupViewHolder, position: Int) {
-        val item = currentList[position]
-        val hasMoreThanOneRequest = item.requests.size > 1
-        holder.bind(item, usernameDetailsClickListener, voteClickListener)
-        holder.binding.root.setOnClickListener {
-            // expand if there is more than 1 request, otherwise show details on click
-            if (hasMoreThanOneRequest) {
-                val index = currentList.indexOfFirst { it.username == item.username }
-                currentList[index].isExpanded = !currentList[index].isExpanded
-                notifyItemChanged(index)
-            } else {
-                usernameDetailsClickListener.invoke(item.requests.first())
+    override fun onBindViewHolder(holder: AbstractUsernameRequestGroupViewHolder, position: Int) {
+        when (val item = currentList[position]) {
+            is UsernameRequestGroupView -> {
+                val hasMoreThanOneRequest = item.requests.size > 1
+                holder as UsernameRequestGroupViewHolder
+                holder.bind(item, usernameDetailsClickListener, voteClickListener)
+                holder.binding.root.setOnClickListener {
+                    // expand if there is more than 1 request, otherwise show details on click
+                    if (hasMoreThanOneRequest) {
+                        val index = currentList.indexOfFirst { it is UsernameRequestGroupView && it.username == item.username }
+                        item.isExpanded = !item.isExpanded
+                        notifyItemChanged(index)
+                    } else {
+                        usernameDetailsClickListener.invoke(item.requests.first())
+                    }
+                }
             }
+            is UsernameRequestRowView -> {
+                holder as DateViewHolder
+                holder.bind(item)
+            }
+        }
+    }
+}
+
+abstract class AbstractUsernameRequestGroupViewHolder(view: View): RecyclerView.ViewHolder(view)
+
+class DateViewHolder(
+    val binding: UsernameRequestDateViewBinding
+): AbstractUsernameRequestGroupViewHolder(binding.root) {
+    fun bind(row: UsernameRequestRowView) {
+        val now = LocalDate.now()
+        val isToday = now == row.localDate
+        val isTomorrow = !isToday && row.localDate == now.plusDays(1)
+
+        binding.dateHeading.text = when {
+            isToday -> binding.root.context.getString(R.string.voting_period_ends_today)
+            isTomorrow -> binding.root.context.getString(R.string.voting_period_ends_tomorrow)
+            else -> binding.root.context.getString(
+                R.string.voting_period_ends_in_days,
+                ChronoUnit.DAYS.between(now, row.localDate)
+            )
         }
     }
 }
 
 class UsernameRequestGroupViewHolder(
     val binding: UsernameRequestGroupViewBinding
-): RecyclerView.ViewHolder(binding.root) {
+): AbstractUsernameRequestGroupViewHolder(binding.root) {
     fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
         val hasMoreThanOneRequest = option.requests.size > 1
         binding.username.text = option.username
@@ -106,13 +181,13 @@ class UsernameRequestGroupViewHolder(
         binding.linkIncluded.isVisible = !hasMoreThanOneRequest && option.requests.first().link != null
 
         val context = binding.root.context
-        binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
-        binding.blocksButton.setOnClickListener {
+        binding.blocksButtonText.text = option.lockVotes().toString()
+        binding.blocksButtonContainer.setOnClickListener {
             usernameClickListener.invoke(UsernameRequest.block(option.username, Names.normalizeString(option.username)))
         }
-        binding.approvalsButton.isVisible = !hasMoreThanOneRequest
-        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, option.requests.maxOf { it.votes }, context.resources.getQuantityString(R.plurals.approval_button, option.requests.maxOf { it.votes }))
-        binding.approvalsButton.setOnClickListener {
+        binding.approvalsButtonContainer.isVisible = !hasMoreThanOneRequest
+        binding.approvalsButtonText.text = option.requests.maxOf { it.votes }.toString()
+        binding.approvalsButtonContainer.setOnClickListener {
             // vote for the first request, which is the only request
             voteClickListener.invoke(option.requests.first())
         }
@@ -120,19 +195,19 @@ class UsernameRequestGroupViewHolder(
         // change the button colors based on our vote(s)
         when (option.lastVote?.type?.lowercase()) {
             UsernameVote.APPROVE -> {
-                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
-                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightRed, R.color.red)
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white)
+                binding.blocksButtonText.text = option.lockVotes().toString()
+                setVoteThemeColors(binding.blocksButtonContainer, binding.blocksButtonText, binding.blocksButtonIcon, R.style.PrimaryButtonTheme_Large_LightRed, R.color.red, R.drawable.ic_thumb_down_red)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white, R.drawable.ic_thumb_up_white)
             }
             UsernameVote.LOCK -> {
-                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.getString(R.string.unblock_button))
-                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Red, R.color.dash_white)
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                binding.blocksButtonText.text = option.lockVotes().toString()
+                setVoteThemeColors(binding.blocksButtonContainer, binding.blocksButtonText, binding.blocksButtonIcon, R.style.PrimaryButtonTheme_Large_Red, R.color.dash_white, R.drawable.ic_thumb_down_white)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
             else -> {
-                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
-                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightRed, R.color.red)
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                binding.blocksButtonText.text = option.lockVotes().toString()
+                setVoteThemeColors(binding.blocksButtonContainer, binding.blocksButtonText, binding.blocksButtonIcon, R.style.PrimaryButtonTheme_Large_LightRed, R.color.red, R.drawable.ic_thumb_down_red)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
         }
 
@@ -215,25 +290,24 @@ class UsernameRequestViewHolder(
     val binding: UsernameRequestViewBinding
 ): AbstractUsernameRequestViewHolder(binding.root) {
     override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
-        val context = binding.root.context
         val dateFormat = SimpleDateFormat("dd MMM yyyy · hh:mm a", Locale.getDefault())
         binding.dateRegistered.text = dateFormat.format(Date(request.createdAt))
 
-        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, request.votes, context.resources.getQuantityString(R.plurals.approval_button, request.votes))
+        binding.approvalsButtonText.text = request.votes.toString()
         val lastVote = votes.lastOrNull()
         when (lastVote?.type) {
             UsernameVote.APPROVE -> {
                 if (lastVote.identity == request.identity) {
-                    binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white)
+                    setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white, R.drawable.ic_thumb_up_white)
                 } else {
-                    binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                    setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
                 }
             }
             UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
             else -> {
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
         }
 
@@ -245,7 +319,7 @@ class UsernameRequestViewHolder(
         binding.root.setOnClickListener {
             listener.invoke(usernameRequest)
         }
-        binding.approvalsButton.setOnClickListener {
+        binding.approvalsButtonContainer.setOnClickListener {
             voteClickListener.invoke(usernameRequest)
         }
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
index e26ec05c0d..bb9c57b30f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
@@ -19,13 +19,31 @@ package de.schildbach.wallet.ui.username.adapters
 
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
 
+/** Base class for items in the Username Request list.  This will be used to display
+ * hold a date to display some presentation of time.
+ */
+open class UsernameRequestRowView(
+    val localDate: LocalDate
+) {
+    override fun equals(other: Any?): Boolean {
+        return other is UsernameRequestRowView && other.localDate == localDate
+    }
+}
+
+/** Represents a username contest that has one or more username requests
+ *  for the same normalizedLabel.
+ */
 data class UsernameRequestGroupView(
     val username: String,
     val requests: List<UsernameRequest>,
     var isExpanded: Boolean = false,
-    var votes: List<UsernameVote>
-) {
+    var votes: List<UsernameVote>,
+    val votingEndDate: Long
+) : UsernameRequestRowView(Instant.ofEpochMilli(votingEndDate).atZone(ZoneId.systemDefault()).toLocalDate()) {
     val lastVote: UsernameVote?
         get() = votes.lastOrNull()
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
index bd158cbf62..f92d660adf 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -420,4 +420,10 @@ class RequestUserNameViewModel @Inject constructor(
     fun logEvent(event: String) {
         analytics.logEvent(event, mapOf())
     }
+
+    suspend fun getVotingStartDate(normalizedLabel: String): Long {
+        return usernameRequestDao.getRequestsByNormalizedLabel(normalizedLabel).minOf {
+            it.createdAt
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
index 675548d2a8..74cb0a8302 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
@@ -24,10 +24,14 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingRequestDetailsBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
@@ -58,35 +62,44 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
             binding.username.text = myUsernameRequest?.username
             binding.identity.text = myUsernameRequest?.identity
             var isVotingOver = false
-            val votingResults = myUsernameRequest?.createdAt?.let { startTime ->
-                val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
-                val dateFormat = DateFormat.getMediumDateFormat(requireContext())
-                isVotingOver = endTime < System.currentTimeMillis()
-                if (isVotingOver) {
-                    getString(R.string.request_username_taken_results)
-                } else {
-                    dateFormat.format(endTime)
+            lifecycleScope.launch {
+                val startDate = withContext(Dispatchers.IO) {
+                    myUsernameRequest?.let {
+                        requestUserNameViewModel.getVotingStartDate(it.normalizedLabel)
+                    }
                 }
-            } ?: "Voting Period not found"
-            binding.votingRange.text = votingResults
-            when {
-                isVotingOver -> {
-                    binding.link.text = if (myUsernameRequest?.link != null && myUsernameRequest.link != "") {
-                        myUsernameRequest.link
+                val votingResults = startDate?.let { startTime ->
+                    val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
+                    val dateFormat = DateFormat.getMediumDateFormat(requireContext())
+                    isVotingOver = endTime < System.currentTimeMillis()
+                    if (isVotingOver) {
+                        getString(R.string.request_username_taken_results)
                     } else {
-                        getString(R.string.none)
+                        dateFormat.format(endTime)
+                    }
+                } ?: "Voting period not found"
+                binding.votingRange.text = votingResults
+                when {
+                    isVotingOver -> {
+                        binding.link.text = if (myUsernameRequest?.link != null && myUsernameRequest.link != "") {
+                            myUsernameRequest.link
+                        } else {
+                            getString(R.string.none)
+                        }
+                        binding.linkLayout.isVisible = true
+                        binding.verifyNowLayout.isVisible = false
+                    }
+
+                    myUsernameRequest?.link != null && myUsernameRequest.link != "" -> {
+                        binding.link.text = myUsernameRequest.link
+                        binding.linkLayout.isVisible = true
+                        binding.verifyNowLayout.isVisible = false
+                    }
+
+                    else -> {
+                        binding.linkLayout.isVisible = false
+                        binding.verifyNowLayout.isVisible = true
                     }
-                    binding.linkLayout.isVisible = true
-                    binding.verifyNowLayout.isVisible = false
-                }
-                myUsernameRequest?.link != null && myUsernameRequest.link != "" -> {
-                    binding.link.text = myUsernameRequest.link
-                    binding.linkLayout.isVisible = true
-                    binding.verifyNowLayout.isVisible = false
-                }
-                else -> {
-                    binding.linkLayout.isVisible = false
-                    binding.verifyNowLayout.isVisible = true
                 }
             }
         }