From 90b7e67270d31ad17e37e3bba5dc8f1041fd1878 Mon Sep 17 00:00:00 2001
From: Ladd Hoffman <laddhoffman@gmail.com>
Date: Sat, 16 Mar 2024 21:55:46 -0500
Subject: [PATCH] fixup request status

---
 client/src/App.jsx          | 15 ---------------
 client/src/WorkRequests.jsx | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/src/App.jsx b/client/src/App.jsx
index adc9425..486bebb 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -169,24 +169,9 @@ function App() {
     };
 
     const fetchWorkRequest = async (requestIndex) => {
-      const getRequestStatus = (request) => {
-        switch (Number(request.status)) {
-          case -1:
-            return 'Requested';
-          case 0:
-            return 'Evidence Submitted';
-          case 1:
-            return 'Approval Submitted';
-          case 2:
-            return 'Complete';
-          default:
-            return 'Unknown';
-        }
-      };
       const r = await work1Contract.methods.requests(requestIndex).call();
       Object.assign(r, {
         id: Number(requestIndex),
-        statusString: getRequestStatus(r),
         feeEther: web3.utils.fromWei(r.fee, 'ether'),
         currentUserIsCustomer: () => r.customer.toLowerCase()
             === account.toString().toLowerCase(),
diff --git a/client/src/WorkRequests.jsx b/client/src/WorkRequests.jsx
index fc92e24..5a195ac 100644
--- a/client/src/WorkRequests.jsx
+++ b/client/src/WorkRequests.jsx
@@ -5,6 +5,21 @@ import Button from 'react-bootstrap/Button';
 import Web3 from 'web3';
 import Web3Context from './Web3Context';
 
+const getRequestStatus = (request) => {
+  switch (Number(request.status)) {
+    case 0:
+      return 'Requested';
+    case 1:
+      return 'Evidence Submitted';
+    case 2:
+      return 'Approval Submitted';
+    case 3:
+      return 'Complete';
+    default:
+      return 'Unknown';
+  }
+};
+
 function WorkRequests({ showRequestWork }) {
   const {
     provider, work1, work1Price, workRequests, availabilityStakes, account,
@@ -77,7 +92,7 @@ function WorkRequests({ showRequestWork }) {
                   {' '}
                   ETH
                 </td>
-                <td>{request.statusString}</td>
+                <td>{getRequestStatus(request)}</td>
                 <td>{request.stakeIndex.toString()}</td>
                 <td>{request.approval.toString()}</td>
                 <td>{request.poolIndex.toString()}</td>