feat: add transaction history to requests

oxen-io · Jul 10, 2024 · b47e3b4 · b47e3b4
1 parent 7e814a2
commit b47e3b4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/apps/staking/app/faucet/AuthModule.tsx b/apps/staking/app/faucet/AuthModule.tsx
@@ -127,14 +127,14 @@ export const AuthModule = () => {
         }
 
         const { hash, error, faucetError, history } = res;
+
+        if (history && history.length) {
+          setTransactionHistory(history);
+        }
+
         if (hash) {
           setTransactionHash(hash);
           setFormState(FORM_STATE.SUCCESS);
-
-          if (history && history.length) {
-            setTransactionHistory(history);
-          }
-
           return resolve(hash);
         }
 
@@ -356,7 +356,7 @@ export const AuthModule = () => {
         </>
       ) : null}
 
-      {formState === FORM_STATE.SUCCESS && transactionHistory && transactionHistory.length > 0 ? (
+      {transactionHistory && transactionHistory.length > 0 ? (
         <FaucetTransactions transactionHistory={transactionHistory} />
       ) : null}
 

diff --git a/apps/staking/app/faucet/actions.ts b/apps/staking/app/faucet/actions.ts
@@ -28,10 +28,13 @@ import {
 
 class FaucetError extends Error {
   faucetError: FAUCET_ERROR;
-  constructor(faucetError: FAUCET_ERROR, message: string) {
+  history?: Array<TransactionHistory>;
+
+  constructor(faucetError: FAUCET_ERROR, message: string, history?: Array<TransactionHistory>) {
     super(message);
     this.name = 'FaucetError';
     this.faucetError = faucetError;
+    this.history = history;
   }
 }
 
@@ -227,7 +230,12 @@ export async function transferTestTokens({
           hoursBetweenTransactions,
         })
       ) {
-        throw new FaucetError(FAUCET_ERROR.ALREADY_USED, dictionary('alreadyUsed'));
+        const transactionHistory = getTransactionHistory({ db, address: targetAddress });
+        throw new FaucetError(
+          FAUCET_ERROR.ALREADY_USED,
+          dictionary('alreadyUsed'),
+          transactionHistory
+        );
       }
 
       usedOperatorAddress = true;
@@ -360,7 +368,11 @@ export async function transferTestTokens({
   } catch (error) {
     console.error(error);
     if (error instanceof FaucetError) {
-      result = new FaucetResult({ error: error.message, faucetError: error.faucetError });
+      result = new FaucetResult({
+        error: error.message,
+        faucetError: error.faucetError,
+        history: error.history,
+      });
     } else if (error instanceof Error) {
       result = new FaucetResult({ error: error.message });
     } else {