diff --git a/src/components/Earn.jsx b/src/components/Earn.jsx
index 5c6dda0d..84dbfd87 100644
--- a/src/components/Earn.jsx
+++ b/src/components/Earn.jsx
@@ -1,20 +1,67 @@
import React from 'react'
import { useEffect, useState } from 'react'
import * as rb from 'react-bootstrap'
+import { useSettings } from '../context/SettingsContext'
+import Sprite from './Sprite'
import * as Api from '../libs/JmWalletApi'
const OFFERTYPE_REL = 'sw0reloffer'
const OFFERTYPE_ABS = 'sw0absoffer'
+const YieldgenReport = ({ lines }) => {
+ const settings = useSettings()
+
+ const empty = !lines || lines.length < 2
+ const headers = empty ? [] : lines[0].split(',')
+ const linesWithoutHeader = empty
+ ? []
+ : lines
+ .slice(1, lines.length)
+ .map((line) => line.split(','))
+ .reverse()
+
+ return (
+
+ {empty && The report is empty.}
+ {!empty && (
+ <>
+
+
+
+ {headers.map((name, index) => (
+ | {name} |
+ ))}
+
+
+
+ {linesWithoutHeader.map((line, lineIndex) => (
+
+ {line.map((val, valIndex) => (
+ | {val} |
+ ))}
+
+ ))}
+
+
+
+ )}
+
+ )
+}
+
export default function Earn({ currentWallet, makerRunning }) {
+ const settings = useSettings()
const [validated, setValidated] = useState(false)
const [alert, setAlert] = useState(null)
const [isSending, setIsSending] = useState(false)
const [isWaiting, setIsWaiting] = useState(false)
+ const [isReportLoading, setIsReportLoading] = useState(false)
+ const [isShowReport, setIsShowReport] = useState(false)
const [offertype, setOffertype] = useState(window.localStorage.getItem('jm-offertype') || OFFERTYPE_REL)
const [feeRel, setFeeRel] = useState(parseFloat(window.localStorage.getItem('jm-feeRel')) || 0.0003)
const [feeAbs, setFeeAbs] = useState(parseInt(window.localStorage.getItem('jm-feeAbs'), 10) || 250)
const [minsize, setMinsize] = useState(parseInt(window.localStorage.getItem('jm-minsize'), 10) || 100000)
+ const [yieldgenReportLines, setYieldgenReportLines] = useState([])
const setAndPersistOffertype = (value) => {
setOffertype(value)
@@ -74,6 +121,30 @@ export default function Earn({ currentWallet, makerRunning }) {
setAlert(null)
}, [makerRunning])
+ useEffect(() => {
+ if (!isShowReport) return
+
+ const abortCtrl = new AbortController()
+ setIsReportLoading(true)
+
+ Api.getYieldgenReport({ signal: abortCtrl.signal })
+ .then((res) => {
+ if (res.ok) return res.json()
+ // 404 is returned till the maker is started at least once
+ if (res.status === 404) return {}
+ return Promise.reject(new Error(res.message || 'Failed to load yield generator report.'))
+ })
+ .then((data) => setYieldgenReportLines(data.yigen_data))
+ .catch((err) => {
+ console.log(`Error while loading yield generator`, err)
+ })
+ // show the loader a little longer to avoid flickering
+ .then((_) => new Promise((r) => setTimeout(r, 200)))
+ .finally(() => setIsReportLoading(false))
+
+ return () => abortCtrl.abort()
+ }, [makerRunning, isShowReport])
+
const stopMakerService = async () => {
const { name: walletName, token } = currentWallet
@@ -118,79 +189,109 @@ export default function Earn({ currentWallet, makerRunning }) {
const isRelOffer = offertype === OFFERTYPE_REL
return (
-
+ <>
{alert && {alert.message}}
Service {makerRunning ? 'running' : 'not running'}.
- {!makerRunning && !isWaiting && (
- <>
-
- setAndPersistOffertype(e.target.checked ? OFFERTYPE_REL : OFFERTYPE_ABS)}
- />
-
- {isRelOffer ? (
-
- Relative Fee (percent)
- setAndPersistFeeRel(e.target.value)}
- />
- Please provide a relative fee.
-
- ) : (
-
- Absolute Fee in SATS
- setAndPersistFeeAbs(e.target.value)}
- />
- Please provide an absolute fee.
-
- )}
-
- Minimum amount in SATS
- setAndPersistMinsize(e.target.value)}
- />
- Please provide a minimum amount.
-
-
- )}
-
- {isSending ? (
+
+ {!makerRunning && !isWaiting && (
<>
-
- {makerRunning === true ? 'Stopping' : 'Starting'}
+
+ setAndPersistOffertype(e.target.checked ? OFFERTYPE_REL : OFFERTYPE_ABS)}
+ />
+
+ {isRelOffer ? (
+
+ Relative Fee (percent)
+ setAndPersistFeeRel(e.target.value)}
+ />
+ Please provide a relative fee.
+
+ ) : (
+
+ Absolute Fee in SATS
+ setAndPersistFeeAbs(e.target.value)}
+ />
+ Please provide an absolute fee.
+
+ )}
+
+ Minimum amount in SATS
+ setAndPersistMinsize(e.target.value)}
+ />
+ Please provide a minimum amount.
+
- ) : makerRunning === true ? (
- 'Stop'
- ) : (
- 'Start'
)}
-
-
+
+ {isSending ? (
+ <>
+
+ {makerRunning === true ? 'Stopping' : 'Starting'}
+
+ ) : makerRunning === true ? (
+ 'Stop'
+ ) : (
+ 'Start'
+ )}
+
+
+
+ {settings.useAdvancedWalletMode && (
+
+
Report
+ {
+ e.preventDefault()
+ setIsShowReport(!isShowReport)
+ }}
+ >
+
+ {isShowReport ? 'Hide' : 'Show'} report
+ {isReportLoading && (
+
+ )}
+
+ {isShowReport && }
+
+ )}
+
)
}
diff --git a/src/libs/JmWalletApi.js b/src/libs/JmWalletApi.js
index d5f5b77d..1325835c 100644
--- a/src/libs/JmWalletApi.js
+++ b/src/libs/JmWalletApi.js
@@ -124,6 +124,12 @@ const postCoinjoin = async ({ walletName, token }, { account, destination, amoun
})
}
+const getYieldgenReport = async ({ signal }) => {
+ return await fetch(`/api/v1/wallet/yieldgen/report`, {
+ signal,
+ })
+}
+
export {
postMakerStart,
getMakerStop,
@@ -137,4 +143,5 @@ export {
getWalletLock,
postWalletUnlock,
getWalletUtxos,
+ getYieldgenReport,
}