From af7bc088289a974e4edcb0ea162c0ee395b61407 Mon Sep 17 00:00:00 2001
From: Will O'Beirne <wbobeirne@gmail.com>
Date: Tue, 19 Feb 2019 12:19:47 -0500
Subject: [PATCH] Simplify logic.

---
 admin/src/components/ContributionDetail/index.tsx | 3 ++-
 backend/grant/admin/views.py                      | 3 +--
 backend/grant/utils/pagination.py                 | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/ContributionDetail/index.tsx b/admin/src/components/ContributionDetail/index.tsx
index 9b162bda..e7a7d776 100644
--- a/admin/src/components/ContributionDetail/index.tsx
+++ b/admin/src/components/ContributionDetail/index.tsx
@@ -69,7 +69,8 @@ class ContributionDetail extends React.Component<Props, State> {
               </p>
               <pre>{c.refundAddress}</pre>
               <p>
-                They will be sent an email notifying them of the refund.
+                They will be sent an email notifying them of the refund when you
+                enter the txid below.
               </p>
               <Input.Search
                 placeholder="Enter payment txid"
diff --git a/backend/grant/admin/views.py b/backend/grant/admin/views.py
index fcb60fdd..2ea62835 100644
--- a/backend/grant/admin/views.py
+++ b/backend/grant/admin/views.py
@@ -87,8 +87,7 @@ def stats():
     # Count contributions on proposals that didn't get funded for users who have specified a refund address
     contribution_refundable_count = db.session.query(func.count(ProposalContribution.id)) \
         .join(Proposal) \
-        .filter(Proposal.stage == ProposalStage.FUNDING_REQUIRED) \
-        .filter(Proposal.date_published + timedelta(seconds=1) * Proposal.deadline_duration < datetime.now()) \
+        .filter(Proposal.stage == ProposalStage.REFUNDING) \
         .join(ProposalContribution.user) \
         .join(UserSettings) \
         .filter(UserSettings.refund_address != None) \
diff --git a/backend/grant/utils/pagination.py b/backend/grant/utils/pagination.py
index 9c0f6bb9..6b9ec06d 100644
--- a/backend/grant/utils/pagination.py
+++ b/backend/grant/utils/pagination.py
@@ -153,8 +153,7 @@ class ContributionPagination(Pagination):
             
             if 'REFUNDABLE' in filters:
                 query = query.join(Proposal) \
-                    .filter(Proposal.stage == ProposalStage.FUNDING_REQUIRED) \
-                    .filter(Proposal.date_published + timedelta(seconds=1) * Proposal.deadline_duration < datetime.now()) \
+                    .filter(Proposal.stage == ProposalStage.REFUNDING) \
                     .join(ProposalContribution.user) \
                     .join(UserSettings) \
                     .filter(UserSettings.refund_address != None) \