lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: increased width of inputs so they doesn't cut off text

Browse source 
fix: reenabled the cash-out display component with 500 notes max bot and top

fix: fixed repeated import on new-admin config accounts

feat: reenabled the cash-out display component
This commit is contained in:
Liordino Neto 2020-07-15 17:48:09 -03:00 • committed by Josh Harvey
parent c3222362d7
commit 112544fc75
6 changed files with 78 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

83
new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
View file

@ -5,6 +5,7 @@ import * as Yup from 'yup'
import { TL2 } from 'src/components/typography'
import { Cashbox } from '../../../components/inputs/cashbox/Cashbox'
import NotificationsCtx from '../NotificationsContext'
import Header from '../components/EditHeader'
import EditableNumber from '../components/EditableNumber'
@ -13,20 +14,13 @@ import styles from './FiatBalanceAlerts.styles.js'
const useStyles = makeStyles(styles)
const schema = Yup.object().shape({
fiatBalanceCassette1: Yup.number()
.integer()
.min(0)
.required(),
fiatBalanceCassette2: Yup.number()
.integer()
.min(0)
.required()
})
const NAME = 'fiatBalanceAlerts'
const FiatBalance = ({ section }) => {
const FiatBalance = ({
section,
max = Number.MAX_SAFE_INTEGER,
fieldWidth = 80
}) => {
const { isEditing, isDisabled, setEditing, data, save } = useContext(
NotificationsCtx
)
@ -34,6 +28,27 @@ const FiatBalance = ({ section }) => {
const editing = isEditing(NAME)
const schema = Yup.object().shape({
fiatBalanceCassette1: Yup.number()
.integer()
.min(0)
.max(max)
.required(),
fiatBalanceCassette2: Yup.number()
.integer()
.min(0)
.max(max)
.required()
})
const fiatBalanceCassette1Percent = data?.fiatBalanceCassette1
? (100 * data?.fiatBalanceCassette1) / max
: 0
const fiatBalanceCassette2Percent = data?.fiatBalanceCassette2
? (100 * data?.fiatBalanceCassette2) / max
: 0
return (
<Formik
enableReinitialize
@ -55,24 +70,34 @@ const FiatBalance = ({ section }) => {
/>
<div className={classes.wrapper}>
<div className={classes.first}>
<TL2 className={classes.title}>Cassette 1 (Top)</TL2>
<EditableNumber
label="Alert me under"
name="fiatBalanceCassette1"
editing={editing}
displayValue={x => (x === '' ? '-' : x)}
decoration="notes"
/>
<div className={classes.row}>
<Cashbox percent={fiatBalanceCassette1Percent} cashOut />
<div className={classes.col2}>
<TL2 className={classes.title}>Cassette 1 (Top)</TL2>
<EditableNumber
label="Alert me under"
name="fiatBalanceCassette1"
editing={editing}
displayValue={x => (x === '' ? '-' : x)}
decoration="notes"
width={fieldWidth}
/>
</div>
</div>
</div>
<div>
<TL2 className={classes.title}>Cassette 2 (Bottom)</TL2>
<EditableNumber
label="Alert me under"
name="fiatBalanceCassette2"
editing={editing}
displayValue={x => (x === '' ? '-' : x)}
decoration="notes"
/>
<div className={classes.row}>
<Cashbox percent={fiatBalanceCassette2Percent} cashOut />
<div className={classes.col2}>
<TL2 className={classes.title}>Cassette 2 (Bottom)</TL2>
<EditableNumber
label="Alert me under"
name="fiatBalanceCassette2"
editing={editing}
displayValue={x => (x === '' ? '-' : x)}
decoration="notes"
width={fieldWidth}
/>
</div>
</div>
</div>
</Form>