diff --git a/src/eventButton.js b/src/eventButton.js index 5e4857c..39b41cd 100644 --- a/src/eventButton.js +++ b/src/eventButton.js @@ -80,6 +80,53 @@ const EventButton = (obj) => { thisColour = stakeColour; } + // Check name filter on transactionCaller, transactionFrom, transactionTo + if (obj.searchTerm){ + if (obj.searchTerm !== ""){ + let isFiltered = true; + if (transactionCaller.toLowerCase().includes(obj.searchTerm.toLowerCase())) isFiltered = false; + if (transactionFrom.toLowerCase().includes(obj.searchTerm.toLowerCase())) isFiltered = false; + if (transactionTo.toLowerCase().includes(obj.searchTerm.toLowerCase())) isFiltered = false; + if (isFiltered) return null; + } + } + let isFiltered = true; + // Check boolean filters on transactionName + let count = 0; + if(obj.filterActivated){ + if (transactionName === "Activated"){ + isFiltered = false; + } + count++; + } + if(obj.rewardActivated){ + if (transactionName === "Reward"){ + isFiltered = false; + } + count++; + } + if(obj.updateActivated){ + if (transactionName === "Update"){ + isFiltered = false; + } + count++; + } + if(obj.withdrawActivated){ + if (transactionName === "Withdraw"){ + isFiltered = false; + } + count++; + } + if(obj.stakeActivated){ + if (transactionName === "Stake"){ + isFiltered = false; + } + count++; + } + if (isFiltered && count){ + return null; + } + let eventSpecificInfo; if (transactionName === "Reward") { if (transactionAmount - 69 < 1 && transactionAmount - 69 > 0) { diff --git a/src/eventViewer.js b/src/eventViewer.js index 9d2bf9f..1c32d8c 100644 --- a/src/eventViewer.js +++ b/src/eventViewer.js @@ -1,8 +1,21 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import EventButton from "./eventButton"; import ScrollContainer from 'react-indiana-drag-scroll'; +const activationColour = "rgba(23, 60, 122, 0.3)"; +const rewardColour = "rgba(20, 99, 29, 0.3)"; +const updateColour = "rgba(122, 63, 23, 0.3)"; +const withdrawStakeColour = "rgba(102, 3, 10, 0.3)"; +const stakeColour = "rgba(71, 23, 122, 0.3)"; + const EventViewer = (obj) => { + const [searchTerm, setSearchTerm] = useState(""); + const [filterActivated, setFilterActivated] = useState(false); + const [rewardActivated, setRewardActivated] = useState(false); + const [updateActivated, setUpdateActivated] = useState(false); + const [withdrawActivated, setWithdrawActivated] = useState(false); + const [stakeActivated, setStakeActivated] = useState(false); + let txCounter = 0; let currentTx = ""; let currentUrl = ""; @@ -15,13 +28,23 @@ const EventViewer = (obj) => { let finalIdx = 0; return (