Merge pull request lidofinance#177 from lidofinance/lido-fee

[aragon][Lido] display/manage fee in percentages
dechjo · Nov 24, 2020 · d01aee4 · d01aee4
2 parents 85be1d3 + 6d5d7a7
commit d01aee4
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 72 deletions.
diff --git a/apps/lido/app/src/App.js b/apps/lido/app/src/App.js
@@ -33,7 +33,7 @@ export default function App() {
   const closeChangeFeePanel = () => setChangeFeePanelOpened(false)
   const apiSetFee = useCallback(
     (newFee) => {
-      return api.setFee(newFee)
+      return api.setFee(newFee).toPromise()
     },
     [api]
   )
@@ -146,7 +146,7 @@ export default function App() {
         label: 'Fee',
         content: (
           <span style={{ display: 'flex', alignItems: 'center' }}>
-            <strong>{fee || 'No data'}</strong>
+            <strong>{fee ? `${fee / 100}%` : 'No data'}</strong>
             <Button
               icon={<IconEdit />}
               label="Change fee"
@@ -266,7 +266,10 @@ export default function App() {
         label: 'Deposits',
         content: <strong>{stat.depositedValidators}</strong>,
       },
-      { label: 'Balance', content: <strong>{formatEth(stat.beaconBalance)}</strong> },
+      {
+        label: 'Balance',
+        content: <strong>{formatEth(stat.beaconBalance)}</strong>,
+      },
     ]
   }, [appState])
 

diff --git a/apps/lido/app/src/components/ChangeFeeSidePanel.js b/apps/lido/app/src/components/ChangeFeeSidePanel.js
@@ -1,78 +1,86 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import {
-  Button,
-  GU,
-  SidePanel,
-  Info,
-  Field,
-  TextInput,
-  useSidePanel,
-} from '@aragon/ui'
+import React, { useCallback } from 'react'
+import { Button, GU, SidePanel, Info } from '@aragon/ui'
+import * as yup from 'yup'
+import { Formik, Field } from 'formik'
+import TextField from './TextField'
 
-function Panel({ opened, onClose, apiSetFee }) {
-  const inputRef = useRef()
-  const { readyToFocus } = useSidePanel()
-
-  useEffect(() => {
-    if (readyToFocus && inputRef.current) {
-      inputRef.current.focus()
-    }
-  }, [readyToFocus, inputRef])
-
-  const [pending, setPending] = useState(false)
-  const [newFee, setNewFee] = useState(0)
+const initialValues = {
+  fee: 0,
+}
 
-  const onChangeNewFee = useCallback((event) => {
-    setNewFee(+event.target.value)
-  }, [])
+const validationSchema = yup.object().shape({
+  fee: yup
+    .number()
+    .positive()
+    .required()
+    .min(0)
+    .max(100)
+    .test(
+      'fee',
+      `Fee must be an integer or have 1 or 2 decimal places.`,
+      (value) => {
+        const regex = /^\d{1,3}(\.\d{1,2})?$/
+        return regex.test(value)
+      }
+    ),
+})
 
-  const handleChangeFeeSubmit = (event) => {
-    event.preventDefault()
-    setPending(true)
-    apiSetFee(newFee)
-      .toPromise()
-      .then(() => {
-        setNewFee(0)
-        onClose()
-        setPending(false)
-      })
-      .catch(() => {
-        setNewFee(0)
-        onClose()
-        setPending(false)
-      })
-  }
+function Panel({ onClose, apiSetFee }) {
+  const handleChangeFeeSubmit = useCallback(
+    ({ fee }) => {
+      apiSetFee(fee * 100)
+        .catch(console.error)
+        .finally(() => {
+          onClose()
+        })
+    },
+    [apiSetFee, onClose]
+  )
 
   return (
-    <form
-      css={`
-        margin-top: ${3 * GU}px;
-      `}
+    <Formik
+      initialValues={initialValues}
+      validationSchema={validationSchema}
+      validateOnBlur={false}
+      validateOnChange={false}
       onSubmit={handleChangeFeeSubmit}
     >
-      <Info
-        title="Action"
-        css={`
-          margin-bottom: ${3 * GU}px;
-        `}
-      >
-        This action will change the fee.
-      </Info>
-      <Field label="New fee value">
-        <TextInput
-          type="number"
-          min={0}
-          step="any"
-          onChange={onChangeNewFee}
-          required
-          wide
-          ref={inputRef}
-        />
-      </Field>
-      <Button mode="strong" type="submit" disabled={pending}>
-        Set fee
-      </Button>
-    </form>
+      {({ submitForm, isSubmitting, isValidating }) => {
+        return (
+          <form
+            css={`
+              margin-top: ${3 * GU}px;
+            `}
+            onSubmit={(e) => {
+              e.preventDefault()
+              submitForm()
+            }}
+          >
+            <Info
+              title="Action"
+              css={`
+                margin-bottom: ${3 * GU}px;
+              `}
+            >
+              This action will change the fee rate.
+            </Info>
+            <Field
+              name="fee"
+              type="number"
+              label="Fee (%)"
+              component={TextField}
+            />
+            <Button
+              mode="strong"
+              type="submit"
+              disabled={isValidating || isSubmitting}
+            >
+              Set fee
+            </Button>
+          </form>
+        )
+      }}
+    </Formik>
   )
 }
 

diff --git a/apps/lido/app/src/index.js b/apps/lido/app/src/index.js
@@ -25,7 +25,10 @@ const defaultState = {
   operators: defaultValue,
   treasury: defaultValue,
   insuranceFund: defaultValue,
-  beaconStat: defaultValue,
+  beaconStat: {
+    depositedValidators: defaultValue,
+    beaconBalance: defaultValue,
+  },
   isSyncing: true,
 }