+
+
+
diff --git a/new-lamassu-admin/src/components/Chip.js b/new-lamassu-admin/src/components/Chip.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/Chip.js
rename to new-lamassu-admin/src/components/Chip.jsx
diff --git a/new-lamassu-admin/src/components/CollapsibleCard.js b/new-lamassu-admin/src/components/CollapsibleCard.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/CollapsibleCard.js
rename to new-lamassu-admin/src/components/CollapsibleCard.jsx
diff --git a/new-lamassu-admin/src/components/ConfirmDialog.js b/new-lamassu-admin/src/components/ConfirmDialog.jsx
similarity index 97%
rename from new-lamassu-admin/src/components/ConfirmDialog.js
rename to new-lamassu-admin/src/components/ConfirmDialog.jsx
index ce6a6bc3..0d849ed1 100644
--- a/new-lamassu-admin/src/components/ConfirmDialog.js
+++ b/new-lamassu-admin/src/components/ConfirmDialog.jsx
@@ -6,11 +6,11 @@ import {
InputLabel
} from '@material-ui/core'
import React, { memo, useState } from 'react'
+import { H4, P } from 'src/components/typography'
+import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
import { Button, IconButton } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs'
-import { H4, P } from 'src/components/typography'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
import { spacer } from 'src/styling/variables'
import ErrorMessage from './ErrorMessage'
diff --git a/new-lamassu-admin/src/components/DeleteDialog.js b/new-lamassu-admin/src/components/DeleteDialog.jsx
similarity index 92%
rename from new-lamassu-admin/src/components/DeleteDialog.js
rename to new-lamassu-admin/src/components/DeleteDialog.jsx
index 50821e81..256c0f27 100644
--- a/new-lamassu-admin/src/components/DeleteDialog.js
+++ b/new-lamassu-admin/src/components/DeleteDialog.jsx
@@ -1,98 +1,98 @@
-import {
- Dialog,
- DialogActions,
- DialogContent,
- makeStyles
-} from '@material-ui/core'
-import React from 'react'
-
-import { Button, IconButton } from 'src/components/buttons'
-import { H4, P } from 'src/components/typography'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
-import { spacer } from 'src/styling/variables'
-
-import ErrorMessage from './ErrorMessage'
-
-const useStyles = makeStyles({
- content: {
- width: 434,
- padding: spacer * 2,
- paddingRight: spacer * 3.5
- },
- titleSection: {
- padding: spacer * 2,
- paddingRight: spacer * 1.5,
- display: 'flex',
- justifyContent: 'space-between',
- margin: 0
- },
- actions: {
- padding: spacer * 4,
- paddingTop: spacer * 2
- },
- title: {
- margin: 0
- },
- closeButton: {
- padding: 0,
- marginTop: -(spacer / 2)
- }
-})
-
-export const DialogTitle = ({ children, close }) => {
- const classes = useStyles()
- return (
-
-
- Save
-
- {!forceAdd && (
-
- Cancel
-
- )}
-
- )}
- {!editing && enableEdit && (
-
- onEdit && onEdit(values.id)}>
- {disableEdit ?
-
- )}
- {!editing && enableDelete && (
-
- {
- setDeleteDialog(true)
- }}>
- {disabled ?
- {
- setDeleteDialog(false)
- clearError()
- }}
- errorMessage={error}
- />
-
- )}
- {!editing && enableToggle && (
-
- onToggle(values.id)}
- />
-
- )}
-
- )
-}
-
-const ECol = ({ editing, focus, config, extraPaddingRight, extraPadding }) => {
- const {
- name,
- names,
- bypassField,
- input,
- editable = true,
- size,
- bold,
- width,
- textAlign,
- editingAlign = textAlign,
- prefix,
- PrefixComponent = Label2,
- suffix,
- SuffixComponent = Label2,
- textStyle = it => {},
- isHidden = it => false,
- view = it => it?.toString(),
- inputProps = {}
- } = config
-
- const fields = names ?? [name]
-
- const { values } = useFormikContext()
- const isEditable = editable => {
- if (typeof editable === 'function') return editable(values)
- return editable
- }
- const isEditing = editing && isEditable(editable)
- const isField = !bypassField
-
- const classes = useStyles({
- textAlign: isEditing ? editingAlign : textAlign,
- size
- })
-
- const innerProps = {
- fullWidth: true,
- autoFocus: focus,
- size,
- bold,
- textAlign: isEditing ? editingAlign : textAlign,
- ...inputProps
- }
-
- return (
-
- {innerElements.map((it, idx) => {
- return (
-
- )
-}
-
-export default ERow
+import { makeStyles } from '@material-ui/core'
+import classnames from 'classnames'
+import { Field, useFormikContext } from 'formik'
+import * as R from 'ramda'
+import React, { useContext, useState } from 'react'
+import { DeleteDialog } from 'src/components/DeleteDialog'
+import { Td, Tr } from 'src/components/fake-table/Table'
+import { Label2 } from 'src/components/typography'
+import DisabledDeleteIcon from 'src/styling/icons/action/delete/disabled.svg?react'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+import DisabledEditIcon from 'src/styling/icons/action/edit/disabled.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
+import StripesSvg from 'src/styling/icons/stripes.svg?react'
+
+import { Link, IconButton } from 'src/components/buttons'
+import { Switch } from 'src/components/inputs'
+
+import TableCtx from './Context'
+import styles from './Row.styles'
+
+const useStyles = makeStyles(styles)
+
+const ActionCol = ({ disabled, editing }) => {
+ const classes = useStyles()
+ const { values, submitForm, resetForm } = useFormikContext()
+ const {
+ editWidth,
+ onEdit,
+ enableEdit,
+ enableDelete,
+ disableRowEdit,
+ onDelete,
+ deleteWidth,
+ enableToggle,
+ onToggle,
+ toggleWidth,
+ forceAdd,
+ clearError,
+ actionColSize,
+ error
+ } = useContext(TableCtx)
+
+ const disableEdit = disabled || (disableRowEdit && disableRowEdit(values))
+ const cancel = () => {
+ clearError()
+ resetForm()
+ }
+
+ const [deleteDialog, setDeleteDialog] = useState(false)
+
+ const onConfirmed = () => {
+ onDelete(values.id).then(res => {
+ if (!R.isNil(res)) setDeleteDialog(false)
+ })
+ }
+
+ return (
+ <>
+ {editing && (
+
+
+ Save
+
+ {!forceAdd && (
+
+ Cancel
+
+ )}
+
+ )}
+ {!editing && enableEdit && (
+
+ onEdit && onEdit(values.id)}>
+ {disableEdit ?
+
+ )}
+ {!editing && enableDelete && (
+
+ {
+ setDeleteDialog(true)
+ }}>
+ {disabled ?
+ {
+ setDeleteDialog(false)
+ clearError()
+ }}
+ errorMessage={error}
+ />
+
+ )}
+ {!editing && enableToggle && (
+
+ onToggle(values.id)}
+ />
+
+ )}
+
+ )
+}
+
+const ECol = ({ editing, focus, config, extraPaddingRight, extraPadding }) => {
+ const {
+ name,
+ names,
+ bypassField,
+ input,
+ editable = true,
+ size,
+ bold,
+ width,
+ textAlign,
+ editingAlign = textAlign,
+ prefix,
+ PrefixComponent = Label2,
+ suffix,
+ SuffixComponent = Label2,
+ textStyle = it => {},
+ isHidden = it => false,
+ view = it => it?.toString(),
+ inputProps = {}
+ } = config
+
+ const fields = names ?? [name]
+
+ const { values } = useFormikContext()
+ const isEditable = editable => {
+ if (typeof editable === 'function') return editable(values)
+ return editable
+ }
+ const isEditing = editing && isEditable(editable)
+ const isField = !bypassField
+
+ const classes = useStyles({
+ textAlign: isEditing ? editingAlign : textAlign,
+ size
+ })
+
+ const innerProps = {
+ fullWidth: true,
+ autoFocus: focus,
+ size,
+ bold,
+ textAlign: isEditing ? editingAlign : textAlign,
+ ...inputProps
+ }
+
+ return (
+
+ {innerElements.map((it, idx) => {
+ return (
+
+ )
+}
+
+export default ERow
diff --git a/new-lamassu-admin/src/components/editableTable/Table.js b/new-lamassu-admin/src/components/editableTable/Table.jsx
similarity index 97%
rename from new-lamassu-admin/src/components/editableTable/Table.js
rename to new-lamassu-admin/src/components/editableTable/Table.jsx
index a5e66733..58e77cc2 100644
--- a/new-lamassu-admin/src/components/editableTable/Table.js
+++ b/new-lamassu-admin/src/components/editableTable/Table.jsx
@@ -2,13 +2,13 @@ import { makeStyles } from '@material-ui/core'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
-import { v4 } from 'uuid'
-
import PromptWhenDirty from 'src/components/PromptWhenDirty'
-import Link from 'src/components/buttons/Link.js'
-import { AddButton } from 'src/components/buttons/index.js'
+import Link from 'src/components/buttons/Link'
import { TBody, Table } from 'src/components/fake-table/Table'
import { Info2, TL1 } from 'src/components/typography'
+import { v4 } from 'uuid'
+
+import { AddButton } from 'src/components/buttons/index'
import TableCtx from './Context'
import Header from './Header'
@@ -75,7 +75,7 @@ const ETable = ({
setSaving(true)
- const it = validationSchema.cast(value)
+ const it = validationSchema.cast(value, { assert: 'ignore-optionality' })
const index = R.findIndex(R.propEq('id', it.id))(data)
const list = index !== -1 ? R.update(index, it, data) : R.prepend(it, data)
diff --git a/new-lamassu-admin/src/components/fake-table/Table.js b/new-lamassu-admin/src/components/fake-table/Table.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/fake-table/Table.js
rename to new-lamassu-admin/src/components/fake-table/Table.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/Autocomplete.js
rename to new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx
index e5f9b941..84c4e1a1 100644
--- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js
+++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx
@@ -3,9 +3,9 @@ import MAutocomplete from '@material-ui/lab/Autocomplete'
import sort from 'match-sorter'
import * as R from 'ramda'
import React from 'react'
-
import { HoverableTooltip } from 'src/components/Tooltip'
import { P } from 'src/components/typography'
+
import { errorColor, orangeYellow, spring4 } from 'src/styling/variables'
import TextInput from './TextInput'
diff --git a/new-lamassu-admin/src/components/inputs/base/Checkbox.js b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx
similarity index 95%
rename from new-lamassu-admin/src/components/inputs/base/Checkbox.js
rename to new-lamassu-admin/src/components/inputs/base/Checkbox.jsx
index ac3f4946..c70cc699 100644
--- a/new-lamassu-admin/src/components/inputs/base/Checkbox.js
+++ b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx
@@ -3,9 +3,9 @@ import { makeStyles } from '@material-ui/core/styles'
import CheckBoxIcon from '@material-ui/icons/CheckBox'
import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank'
import React from 'react'
-
import { Label2, Info3 } from 'src/components/typography'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
+import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
+
import {
fontSize2,
fontSize3,
diff --git a/new-lamassu-admin/src/components/inputs/base/CodeInput.js b/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/CodeInput.js
rename to new-lamassu-admin/src/components/inputs/base/CodeInput.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/Dropdown.js b/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/Dropdown.js
rename to new-lamassu-admin/src/components/inputs/base/Dropdown.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/NumberInput.js b/new-lamassu-admin/src/components/inputs/base/NumberInput.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/NumberInput.js
rename to new-lamassu-admin/src/components/inputs/base/NumberInput.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/RadioGroup.js
rename to new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
index 4d11f4ed..48520a68 100644
--- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js
+++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
@@ -6,8 +6,8 @@ import {
} from '@material-ui/core'
import classnames from 'classnames'
import React from 'react'
-
import { Label1 } from 'src/components/typography'
+
import { offColor } from 'src/styling/variables'
const styles = {
label: {
diff --git a/new-lamassu-admin/src/components/inputs/base/SecretInput.js b/new-lamassu-admin/src/components/inputs/base/SecretInput.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/SecretInput.js
rename to new-lamassu-admin/src/components/inputs/base/SecretInput.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/Select.js b/new-lamassu-admin/src/components/inputs/base/Select.jsx
similarity index 93%
rename from new-lamassu-admin/src/components/inputs/base/Select.js
rename to new-lamassu-admin/src/components/inputs/base/Select.jsx
index 95f5cd39..c56ad4af 100644
--- a/new-lamassu-admin/src/components/inputs/base/Select.js
+++ b/new-lamassu-admin/src/components/inputs/base/Select.jsx
@@ -3,8 +3,7 @@ import classnames from 'classnames'
import { useSelect } from 'downshift'
import * as R from 'ramda'
import React from 'react'
-
-import { ReactComponent as Arrowdown } from 'src/styling/icons/action/arrow/regular.svg'
+import Arrowdown from 'src/styling/icons/action/arrow/regular.svg?react'
import styles from './Select.styles'
diff --git a/new-lamassu-admin/src/components/inputs/base/Switch.js b/new-lamassu-admin/src/components/inputs/base/Switch.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/Switch.js
rename to new-lamassu-admin/src/components/inputs/base/Switch.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/TextInput.js b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/TextInput.js
rename to new-lamassu-admin/src/components/inputs/base/TextInput.jsx
diff --git a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.js b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.js
rename to new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
index bbd48ff0..72193ce2 100644
--- a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.js
+++ b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
@@ -2,8 +2,8 @@ import { makeStyles } from '@material-ui/core'
import { ToggleButtonGroup as MUIToggleButtonGroup } from '@material-ui/lab'
import ToggleButton from '@material-ui/lab/ToggleButton'
import React from 'react'
-
import { H4, P } from 'src/components/typography'
+
import { backgroundColor, comet } from 'src/styling/variables'
const styles = {
noTextTransform: {
diff --git a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js
rename to new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx
index 68755b53..58bb8cf6 100644
--- a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js
+++ b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React from 'react'
-
import Chip from 'src/components/Chip'
import { Info2, Label1, Label2 } from 'src/components/typography'
+
import { numberToFiatAmount } from 'src/utils/number'
import { cashboxStyles, gridStyles } from './Cashbox.styles'
diff --git a/new-lamassu-admin/src/components/inputs/formik/Autocomplete.js b/new-lamassu-admin/src/components/inputs/formik/Autocomplete.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/formik/Autocomplete.js
rename to new-lamassu-admin/src/components/inputs/formik/Autocomplete.jsx
diff --git a/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.js b/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx
similarity index 99%
rename from new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.js
rename to new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx
index 6a275f42..f5016e67 100644
--- a/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.js
+++ b/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx
@@ -1,7 +1,6 @@
import { makeStyles } from '@material-ui/core'
import classNames from 'classnames'
import React, { memo, useState } from 'react'
-
import { CashOut } from 'src/components/inputs/cashbox/Cashbox'
import { NumberInput } from '../base'
diff --git a/new-lamassu-admin/src/components/inputs/formik/Checkbox.js b/new-lamassu-admin/src/components/inputs/formik/Checkbox.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/formik/Checkbox.js
rename to new-lamassu-admin/src/components/inputs/formik/Checkbox.jsx
diff --git a/new-lamassu-admin/src/components/inputs/formik/Dropdown.js b/new-lamassu-admin/src/components/inputs/formik/Dropdown.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/formik/Dropdown.js
rename to new-lamassu-admin/src/components/inputs/formik/Dropdown.jsx
diff --git a/new-lamassu-admin/src/components/inputs/formik/NumberInput.js b/new-lamassu-admin/src/components/inputs/formik/NumberInput.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/inputs/formik/NumberInput.js
rename to new-lamassu-admin/src/components/inputs/formik/NumberInput.jsx
diff --git a/new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.js b/new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.js
deleted file mode 100644
index e3cb6201..00000000
--- a/new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { makeStyles } from '@material-ui/core'
-import React, { memo, useState } from 'react'
-
-import TextInputFormik from './TextInput'
-import { styles } from './TextInput.styles'
-
-const useStyles = makeStyles(styles)
-
-const mask = /(\+)(9[976]\d|8[987530]\d|6[987]\d|5[90]\d|42\d|3[875]\d|2[98654321]\d|9[8543210]|8[6421]|6[6543210]|5[87654321]|4[987654310]|3[9643210]|2[70]|7|1)(\d{1,3}){0,1}(\d{1,3}){0,1}(\d{1,3}){0,1}(\d{1,3}){0,1}(\d{1,2}){0,1}$/
-const maskValue = value =>
- value ? value.replace(mask, '$1 $2 $3 $4 $5 $6') : ''
-
-const PhoneNumberInputFormik = memo(({ ...props }) => {
- const { onChange, value } = props.field
-
- const classes = useStyles()
-
- // Regex adapted from http://phoneregex.com/
-
- const [maskedValue, setMaskedValue] = useState(maskValue(value))
-
- const handleChange = event => {
- setMaskedValue(maskValue(event.target.value))
-
- onChange(event)
- }
-
- return (
- <>
-
-
-
+
{it.label}
diff --git a/new-lamassu-admin/src/components/layout/Header.styles.js b/new-lamassu-admin/src/components/layout/Header.styles.js
index a1489a90..6c254594 100644
--- a/new-lamassu-admin/src/components/layout/Header.styles.js
+++ b/new-lamassu-admin/src/components/layout/Header.styles.js
@@ -90,7 +90,7 @@ const styles = {
textAlign: 'center',
'&:after': {
display: 'block',
- content: 'attr(forcesize)',
+ content: 'attr(data-forcesize)',
fontWeight: 700,
height: 0,
overflow: 'hidden',
diff --git a/new-lamassu-admin/src/components/layout/Section.js b/new-lamassu-admin/src/components/layout/Section.jsx
similarity index 99%
rename from new-lamassu-admin/src/components/layout/Section.js
rename to new-lamassu-admin/src/components/layout/Section.jsx
index e42c9366..6f0e9302 100644
--- a/new-lamassu-admin/src/components/layout/Section.js
+++ b/new-lamassu-admin/src/components/layout/Section.jsx
@@ -1,6 +1,5 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Subtitle from 'src/components/Subtitle'
diff --git a/new-lamassu-admin/src/components/layout/Sidebar.js b/new-lamassu-admin/src/components/layout/Sidebar.jsx
similarity index 81%
rename from new-lamassu-admin/src/components/layout/Sidebar.js
rename to new-lamassu-admin/src/components/layout/Sidebar.jsx
index 4c60d38e..ff63bc08 100644
--- a/new-lamassu-admin/src/components/layout/Sidebar.js
+++ b/new-lamassu-admin/src/components/layout/Sidebar.jsx
@@ -1,11 +1,10 @@
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React from 'react'
-
import { P } from 'src/components/typography'
-import { ReactComponent as CompleteStageIconZodiac } from 'src/styling/icons/stage/zodiac/complete.svg'
-import { ReactComponent as CurrentStageIconZodiac } from 'src/styling/icons/stage/zodiac/current.svg'
-import { ReactComponent as EmptyStageIconZodiac } from 'src/styling/icons/stage/zodiac/empty.svg'
+import CompleteStageIconZodiac from 'src/styling/icons/stage/zodiac/complete.svg?react'
+import CurrentStageIconZodiac from 'src/styling/icons/stage/zodiac/current.svg?react'
+import EmptyStageIconZodiac from 'src/styling/icons/stage/zodiac/empty.svg?react'
import styles from './Sidebar.styles'
@@ -27,9 +26,11 @@ const Sidebar = ({
{loading &&
- {children}
- {close && (
-
-
- )}
-
- )
-}
-
-export const DeleteDialog = ({
- title = 'Confirm Delete',
- open = false,
- onConfirmed,
- onDismissed,
- item = 'item',
- confirmationMessage = `Are you sure you want to delete this ${item}?`,
- extraMessage,
- errorMessage = ''
-}) => {
- const classes = useStyles()
-
- return (
-
- )
-}
+import {
+ Dialog,
+ DialogActions,
+ DialogContent,
+ makeStyles
+} from '@material-ui/core'
+import React from 'react'
+import { H4, P } from 'src/components/typography'
+import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
+
+import { Button, IconButton } from 'src/components/buttons'
+import { spacer } from 'src/styling/variables'
+
+import ErrorMessage from './ErrorMessage'
+
+const useStyles = makeStyles({
+ content: {
+ width: 434,
+ padding: spacer * 2,
+ paddingRight: spacer * 3.5
+ },
+ titleSection: {
+ padding: spacer * 2,
+ paddingRight: spacer * 1.5,
+ display: 'flex',
+ justifyContent: 'space-between',
+ margin: 0
+ },
+ actions: {
+ padding: spacer * 4,
+ paddingTop: spacer * 2
+ },
+ title: {
+ margin: 0
+ },
+ closeButton: {
+ padding: 0,
+ marginTop: -(spacer / 2)
+ }
+})
+
+export const DialogTitle = ({ children, close }) => {
+ const classes = useStyles()
+ return (
+
+ {children}
+ {close && (
+
+
+ )}
+
+ )
+}
+
+export const DeleteDialog = ({
+ title = 'Confirm Delete',
+ open = false,
+ onConfirmed,
+ onDismissed,
+ item = 'item',
+ confirmationMessage = `Are you sure you want to delete this ${item}?`,
+ extraMessage,
+ errorMessage = ''
+}) => {
+ const classes = useStyles()
+
+ return (
+
+ )
+}
diff --git a/new-lamassu-admin/src/components/ErrorMessage.js b/new-lamassu-admin/src/components/ErrorMessage.jsx
similarity index 90%
rename from new-lamassu-admin/src/components/ErrorMessage.js
rename to new-lamassu-admin/src/components/ErrorMessage.jsx
index 8a1c891b..7433a70b 100644
--- a/new-lamassu-admin/src/components/ErrorMessage.js
+++ b/new-lamassu-admin/src/components/ErrorMessage.jsx
@@ -1,8 +1,8 @@
import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import React from 'react'
+import ErrorIcon from 'src/styling/icons/warning-icon/tomato.svg?react'
-import { ReactComponent as ErrorIcon } from 'src/styling/icons/warning-icon/tomato.svg'
import { errorColor } from 'src/styling/variables'
import { Info3 } from './typography'
diff --git a/new-lamassu-admin/src/components/ImagePopper.js b/new-lamassu-admin/src/components/ImagePopper.jsx
similarity index 89%
rename from new-lamassu-admin/src/components/ImagePopper.js
rename to new-lamassu-admin/src/components/ImagePopper.jsx
index efbf4b13..a9291131 100644
--- a/new-lamassu-admin/src/components/ImagePopper.js
+++ b/new-lamassu-admin/src/components/ImagePopper.jsx
@@ -1,11 +1,11 @@
import { makeStyles, ClickAwayListener } from '@material-ui/core'
import classnames from 'classnames'
import React, { memo, useState } from 'react'
-
import Popper from 'src/components/Popper'
+import ZoomIconInverse from 'src/styling/icons/circle buttons/search/white.svg?react'
+import ZoomIcon from 'src/styling/icons/circle buttons/search/zodiac.svg?react'
+
import { FeatureButton } from 'src/components/buttons'
-import { ReactComponent as ZoomIconInverse } from 'src/styling/icons/circle buttons/search/white.svg'
-import { ReactComponent as ZoomIcon } from 'src/styling/icons/circle buttons/search/zodiac.svg'
import imagePopperStyles from './ImagePopper.styles'
diff --git a/new-lamassu-admin/src/components/InfoMessage.js b/new-lamassu-admin/src/components/InfoMessage.jsx
similarity index 85%
rename from new-lamassu-admin/src/components/InfoMessage.js
rename to new-lamassu-admin/src/components/InfoMessage.jsx
index 77e8c5e9..e0baa4fa 100644
--- a/new-lamassu-admin/src/components/InfoMessage.js
+++ b/new-lamassu-admin/src/components/InfoMessage.jsx
@@ -1,8 +1,7 @@
import { Box, makeStyles } from '@material-ui/core'
import React from 'react'
-
import { Label1 } from 'src/components/typography'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
+import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
const useStyles = makeStyles({
message: ({ width }) => ({
diff --git a/new-lamassu-admin/src/components/InformativeDialog.js b/new-lamassu-admin/src/components/InformativeDialog.jsx
similarity index 94%
rename from new-lamassu-admin/src/components/InformativeDialog.js
rename to new-lamassu-admin/src/components/InformativeDialog.jsx
index 2e9fddba..47959cff 100644
--- a/new-lamassu-admin/src/components/InformativeDialog.js
+++ b/new-lamassu-admin/src/components/InformativeDialog.jsx
@@ -1,9 +1,9 @@
import { Dialog, DialogContent, makeStyles } from '@material-ui/core'
import React, { memo } from 'react'
+import { H1 } from 'src/components/typography'
+import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
import { IconButton } from 'src/components/buttons'
-import { H1 } from 'src/components/typography'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
import { spacer } from 'src/styling/variables'
const useStyles = makeStyles({
diff --git a/new-lamassu-admin/src/components/LogsDownloaderPopper.js b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
similarity index 96%
rename from new-lamassu-admin/src/components/LogsDownloaderPopper.js
rename to new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
index 9c348810..73757ad2 100644
--- a/new-lamassu-admin/src/components/LogsDownloaderPopper.js
+++ b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
@@ -5,11 +5,11 @@ import { format, set } from 'date-fns/fp'
import FileSaver from 'file-saver'
import * as R from 'ramda'
import React, { useState, useCallback } from 'react'
+import Arrow from 'src/styling/icons/arrow/download_logs.svg?react'
+import DownloadInverseIcon from 'src/styling/icons/button/download/white.svg?react'
+import Download from 'src/styling/icons/button/download/zodiac.svg?react'
import { FeatureButton, Link } from 'src/components/buttons'
-import { ReactComponent as Arrow } from 'src/styling/icons/arrow/download_logs.svg'
-import { ReactComponent as DownloadInverseIcon } from 'src/styling/icons/button/download/white.svg'
-import { ReactComponent as Download } from 'src/styling/icons/button/download/zodiac.svg'
import { primaryColor, offColor, zircon } from 'src/styling/variables'
import { formatDate } from 'src/utils/timezones'
diff --git a/new-lamassu-admin/src/components/Modal.js b/new-lamassu-admin/src/components/Modal.jsx
similarity index 94%
rename from new-lamassu-admin/src/components/Modal.js
rename to new-lamassu-admin/src/components/Modal.jsx
index f190004f..aba40236 100644
--- a/new-lamassu-admin/src/components/Modal.js
+++ b/new-lamassu-admin/src/components/Modal.jsx
@@ -1,10 +1,10 @@
import { makeStyles, Modal as MaterialModal, Paper } from '@material-ui/core'
import classnames from 'classnames'
import React from 'react'
+import { H1, H4 } from 'src/components/typography'
+import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
import { IconButton } from 'src/components/buttons'
-import { H1, H4 } from 'src/components/typography'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
const styles = {
modal: {
@@ -55,8 +55,8 @@ const styles = {
margin: xl
? [[0, 0, 'auto', 'auto']]
: small
- ? [[12, 12, 'auto', 'auto']]
- : [[16, 16, 'auto', 'auto']]
+ ? [[12, 12, 'auto', 'auto']]
+ : [[16, 16, 'auto', 'auto']]
}),
header: {
display: 'flex'
diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx
similarity index 91%
rename from new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js
rename to new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx
index 67095851..49208fe3 100644
--- a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js
+++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx
@@ -3,13 +3,12 @@ import { makeStyles } from '@material-ui/core/styles'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
-
import ActionButton from 'src/components/buttons/ActionButton'
import { H5 } from 'src/components/typography'
-import { ReactComponent as NotificationIconZodiac } from 'src/styling/icons/menu/notification-zodiac.svg'
-import { ReactComponent as ClearAllIconInverse } from 'src/styling/icons/stage/spring/empty.svg'
-import { ReactComponent as ClearAllIcon } from 'src/styling/icons/stage/zodiac/empty.svg'
-import { ReactComponent as ShowUnreadIcon } from 'src/styling/icons/stage/zodiac/full.svg'
+import NotificationIconZodiac from 'src/styling/icons/menu/notification-zodiac.svg?react'
+import ClearAllIconInverse from 'src/styling/icons/stage/spring/empty.svg?react'
+import ClearAllIcon from 'src/styling/icons/stage/zodiac/empty.svg?react'
+import ShowUnreadIcon from 'src/styling/icons/stage/zodiac/full.svg?react'
import styles from './NotificationCenter.styles'
import NotificationRow from './NotificationRow'
diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx
similarity index 88%
rename from new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js
rename to new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx
index f5cdea17..96c66dec 100644
--- a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js
+++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx
@@ -3,11 +3,10 @@ import classnames from 'classnames'
import prettyMs from 'pretty-ms'
import * as R from 'ramda'
import React from 'react'
-
import { Label1, Label2, TL2 } from 'src/components/typography'
-import { ReactComponent as Wrench } from 'src/styling/icons/action/wrench/zodiac.svg'
-import { ReactComponent as Transaction } from 'src/styling/icons/arrow/transaction.svg'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/tomato.svg'
+import Wrench from 'src/styling/icons/action/wrench/zodiac.svg?react'
+import Transaction from 'src/styling/icons/arrow/transaction.svg?react'
+import WarningIcon from 'src/styling/icons/warning-icon/tomato.svg?react'
import styles from './NotificationCenter.styles'
const useStyles = makeStyles(styles)
@@ -61,8 +60,8 @@ const NotificationRow = ({
typeDisplay && deviceName
? `${typeDisplay} - ${deviceName}`
: !typeDisplay && deviceName
- ? `${deviceName}`
- : `${typeDisplay}`
+ ? `${deviceName}`
+ : `${typeDisplay}`
const iconClass = {
[classes.readIcon]: read,
diff --git a/new-lamassu-admin/src/components/Popper.js b/new-lamassu-admin/src/components/Popper.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/Popper.js
rename to new-lamassu-admin/src/components/Popper.jsx
diff --git a/new-lamassu-admin/src/components/PromptWhenDirty.js b/new-lamassu-admin/src/components/PromptWhenDirty.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/PromptWhenDirty.js
rename to new-lamassu-admin/src/components/PromptWhenDirty.jsx
diff --git a/new-lamassu-admin/src/components/SearchBox.js b/new-lamassu-admin/src/components/SearchBox.jsx
similarity index 96%
rename from new-lamassu-admin/src/components/SearchBox.js
rename to new-lamassu-admin/src/components/SearchBox.jsx
index 17879abf..b4974123 100644
--- a/new-lamassu-admin/src/components/SearchBox.js
+++ b/new-lamassu-admin/src/components/SearchBox.jsx
@@ -4,9 +4,8 @@ import { makeStyles } from '@material-ui/core/styles'
import MAutocomplete from '@material-ui/lab/Autocomplete'
import classnames from 'classnames'
import React, { memo, useState } from 'react'
-
import { P } from 'src/components/typography'
-import { ReactComponent as SearchIcon } from 'src/styling/icons/circle buttons/search/zodiac.svg'
+import SearchIcon from 'src/styling/icons/circle buttons/search/zodiac.svg?react'
import styles from './SearchBox.styles'
diff --git a/new-lamassu-admin/src/components/SearchFilter.js b/new-lamassu-admin/src/components/SearchFilter.jsx
similarity index 85%
rename from new-lamassu-admin/src/components/SearchFilter.js
rename to new-lamassu-admin/src/components/SearchFilter.jsx
index adb16647..c3195d1d 100644
--- a/new-lamassu-admin/src/components/SearchFilter.js
+++ b/new-lamassu-admin/src/components/SearchFilter.jsx
@@ -1,12 +1,12 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
-
import Chip from 'src/components/Chip'
-import { ActionButton } from 'src/components/buttons'
import { P, Label3 } from 'src/components/typography'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
-import { ReactComponent as FilterIcon } from 'src/styling/icons/button/filter/white.svg'
-import { ReactComponent as ReverseFilterIcon } from 'src/styling/icons/button/filter/zodiac.svg'
+import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
+import FilterIcon from 'src/styling/icons/button/filter/white.svg?react'
+import ReverseFilterIcon from 'src/styling/icons/button/filter/zodiac.svg?react'
+
+import { ActionButton } from 'src/components/buttons'
import { onlyFirstToUpper, singularOrPlural } from 'src/utils/string'
import { chipStyles, styles } from './SearchFilter.styles'
diff --git a/new-lamassu-admin/src/components/Stage.js b/new-lamassu-admin/src/components/Stage.jsx
similarity index 81%
rename from new-lamassu-admin/src/components/Stage.js
rename to new-lamassu-admin/src/components/Stage.jsx
index 916daf4e..0d93080b 100644
--- a/new-lamassu-admin/src/components/Stage.js
+++ b/new-lamassu-admin/src/components/Stage.jsx
@@ -2,13 +2,13 @@ import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { memo } from 'react'
+import CompleteStageIconSpring from 'src/styling/icons/stage/spring/complete.svg?react'
+import CurrentStageIconSpring from 'src/styling/icons/stage/spring/current.svg?react'
+import EmptyStageIconSpring from 'src/styling/icons/stage/spring/empty.svg?react'
+import CompleteStageIconZodiac from 'src/styling/icons/stage/zodiac/complete.svg?react'
+import CurrentStageIconZodiac from 'src/styling/icons/stage/zodiac/current.svg?react'
+import EmptyStageIconZodiac from 'src/styling/icons/stage/zodiac/empty.svg?react'
-import { ReactComponent as CompleteStageIconSpring } from 'src/styling/icons/stage/spring/complete.svg'
-import { ReactComponent as CurrentStageIconSpring } from 'src/styling/icons/stage/spring/current.svg'
-import { ReactComponent as EmptyStageIconSpring } from 'src/styling/icons/stage/spring/empty.svg'
-import { ReactComponent as CompleteStageIconZodiac } from 'src/styling/icons/stage/zodiac/complete.svg'
-import { ReactComponent as CurrentStageIconZodiac } from 'src/styling/icons/stage/zodiac/current.svg'
-import { ReactComponent as EmptyStageIconZodiac } from 'src/styling/icons/stage/zodiac/empty.svg'
import {
primaryColor,
secondaryColor,
diff --git a/new-lamassu-admin/src/components/Status.js b/new-lamassu-admin/src/components/Status.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/Status.js
rename to new-lamassu-admin/src/components/Status.jsx
diff --git a/new-lamassu-admin/src/components/Stepper.js b/new-lamassu-admin/src/components/Stepper.jsx
similarity index 81%
rename from new-lamassu-admin/src/components/Stepper.js
rename to new-lamassu-admin/src/components/Stepper.jsx
index 273f2653..f827ff4b 100644
--- a/new-lamassu-admin/src/components/Stepper.js
+++ b/new-lamassu-admin/src/components/Stepper.jsx
@@ -2,13 +2,13 @@ import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { memo } from 'react'
+import CompleteStageIconSpring from 'src/styling/icons/stage/spring/complete.svg?react'
+import CurrentStageIconSpring from 'src/styling/icons/stage/spring/current.svg?react'
+import EmptyStageIconSpring from 'src/styling/icons/stage/spring/empty.svg?react'
+import CompleteStageIconZodiac from 'src/styling/icons/stage/zodiac/complete.svg?react'
+import CurrentStageIconZodiac from 'src/styling/icons/stage/zodiac/current.svg?react'
+import EmptyStageIconZodiac from 'src/styling/icons/stage/zodiac/empty.svg?react'
-import { ReactComponent as CompleteStageIconSpring } from 'src/styling/icons/stage/spring/complete.svg'
-import { ReactComponent as CurrentStageIconSpring } from 'src/styling/icons/stage/spring/current.svg'
-import { ReactComponent as EmptyStageIconSpring } from 'src/styling/icons/stage/spring/empty.svg'
-import { ReactComponent as CompleteStageIconZodiac } from 'src/styling/icons/stage/zodiac/complete.svg'
-import { ReactComponent as CurrentStageIconZodiac } from 'src/styling/icons/stage/zodiac/current.svg'
-import { ReactComponent as EmptyStageIconZodiac } from 'src/styling/icons/stage/zodiac/empty.svg'
import {
primaryColor,
secondaryColor,
diff --git a/new-lamassu-admin/src/components/Subtitle.js b/new-lamassu-admin/src/components/Subtitle.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/Subtitle.js
rename to new-lamassu-admin/src/components/Subtitle.jsx
diff --git a/new-lamassu-admin/src/components/TableLabel.js b/new-lamassu-admin/src/components/TableLabel.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/TableLabel.js
rename to new-lamassu-admin/src/components/TableLabel.jsx
diff --git a/new-lamassu-admin/src/components/Title.js b/new-lamassu-admin/src/components/Title.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/Title.js
rename to new-lamassu-admin/src/components/Title.jsx
diff --git a/new-lamassu-admin/src/components/Tooltip.js b/new-lamassu-admin/src/components/Tooltip.jsx
similarity index 95%
rename from new-lamassu-admin/src/components/Tooltip.js
rename to new-lamassu-admin/src/components/Tooltip.jsx
index c067c37b..1748c501 100644
--- a/new-lamassu-admin/src/components/Tooltip.js
+++ b/new-lamassu-admin/src/components/Tooltip.jsx
@@ -1,9 +1,8 @@
import { makeStyles, ClickAwayListener } from '@material-ui/core'
import * as R from 'ramda'
import React, { useState, memo } from 'react'
-
import Popper from 'src/components/Popper'
-import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
+import HelpIcon from 'src/styling/icons/action/help/zodiac.svg?react'
const useStyles = makeStyles({
transparentButton: {
@@ -103,7 +102,7 @@ const HoverableTooltip = memo(({ parentElements, children, width }) => {
diff --git a/new-lamassu-admin/src/components/Uptime.js b/new-lamassu-admin/src/components/Uptime.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/Uptime.js
rename to new-lamassu-admin/src/components/Uptime.jsx
diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx
similarity index 92%
rename from new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
rename to new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx
index 71c8a11c..1b4ddbf1 100644
--- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
+++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx
@@ -3,17 +3,17 @@ import classnames from 'classnames'
import { useFormikContext, Form, Formik, Field as FormikField } from 'formik'
import * as R from 'ramda'
import React, { useState, memo } from 'react'
+import PromptWhenDirty from 'src/components/PromptWhenDirty'
+import { H4 } from 'src/components/typography'
+import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
+import FalseIcon from 'src/styling/icons/table/false.svg?react'
+import TrueIcon from 'src/styling/icons/table/true.svg?react'
import * as Yup from 'yup'
-import PromptWhenDirty from 'src/components/PromptWhenDirty'
import { Link, IconButton } from 'src/components/buttons'
import { RadioGroup } from 'src/components/inputs/formik'
import { Table, TableBody, TableRow, TableCell } from 'src/components/table'
-import { H4 } from 'src/components/typography'
-import { ReactComponent as EditIconDisabled } from 'src/styling/icons/action/edit/disabled.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
-import { ReactComponent as FalseIcon } from 'src/styling/icons/table/false.svg'
-import { ReactComponent as TrueIcon } from 'src/styling/icons/table/true.svg'
import { booleanPropertiesTableStyles } from './BooleanPropertiesTable.styles'
diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.js b/new-lamassu-admin/src/components/buttons/ActionButton.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/buttons/ActionButton.js
rename to new-lamassu-admin/src/components/buttons/ActionButton.jsx
diff --git a/new-lamassu-admin/src/components/buttons/AddButton.js b/new-lamassu-admin/src/components/buttons/AddButton.jsx
similarity index 92%
rename from new-lamassu-admin/src/components/buttons/AddButton.js
rename to new-lamassu-admin/src/components/buttons/AddButton.jsx
index edd4a106..267ebaee 100644
--- a/new-lamassu-admin/src/components/buttons/AddButton.js
+++ b/new-lamassu-admin/src/components/buttons/AddButton.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
+import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react'
import typographyStyles from 'src/components/typography/styles'
-import { ReactComponent as AddIcon } from 'src/styling/icons/button/add/zodiac.svg'
import { zircon, zircon2, comet, fontColor, white } from 'src/styling/variables'
const { p } = typographyStyles
diff --git a/new-lamassu-admin/src/components/buttons/Button.js b/new-lamassu-admin/src/components/buttons/Button.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/buttons/Button.js
rename to new-lamassu-admin/src/components/buttons/Button.jsx
diff --git a/new-lamassu-admin/src/components/buttons/DeleteButton.js b/new-lamassu-admin/src/components/buttons/DeleteButton.jsx
similarity index 92%
rename from new-lamassu-admin/src/components/buttons/DeleteButton.js
rename to new-lamassu-admin/src/components/buttons/DeleteButton.jsx
index c1c31082..4be8a651 100644
--- a/new-lamassu-admin/src/components/buttons/DeleteButton.js
+++ b/new-lamassu-admin/src/components/buttons/DeleteButton.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
+import DeleteIcon from 'src/styling/icons/button/cancel/zodiac.svg?react'
import typographyStyles from 'src/components/typography/styles'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/button/cancel/zodiac.svg'
import { zircon, zircon2, comet, fontColor, white } from 'src/styling/variables'
const { p } = typographyStyles
diff --git a/new-lamassu-admin/src/components/buttons/FeatureButton.js b/new-lamassu-admin/src/components/buttons/FeatureButton.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/buttons/FeatureButton.js
rename to new-lamassu-admin/src/components/buttons/FeatureButton.jsx
diff --git a/new-lamassu-admin/src/components/buttons/IDButton.js b/new-lamassu-admin/src/components/buttons/IDButton.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/buttons/IDButton.js
rename to new-lamassu-admin/src/components/buttons/IDButton.jsx
index 15c55602..a43aeb82 100644
--- a/new-lamassu-admin/src/components/buttons/IDButton.js
+++ b/new-lamassu-admin/src/components/buttons/IDButton.jsx
@@ -2,8 +2,8 @@ import { ClickAwayListener } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React, { useState, memo } from 'react'
-
import Popover from 'src/components/Popper'
+
import typographyStyles from 'src/components/typography/styles'
import {
subheaderColor,
diff --git a/new-lamassu-admin/src/components/buttons/IconButton.js b/new-lamassu-admin/src/components/buttons/IconButton.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/buttons/IconButton.js
rename to new-lamassu-admin/src/components/buttons/IconButton.jsx
diff --git a/new-lamassu-admin/src/components/buttons/Link.js b/new-lamassu-admin/src/components/buttons/Link.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/buttons/Link.js
rename to new-lamassu-admin/src/components/buttons/Link.jsx
diff --git a/new-lamassu-admin/src/components/buttons/Link.styles.js b/new-lamassu-admin/src/components/buttons/Link.styles.js
index 89b24776..0d05e9c1 100644
--- a/new-lamassu-admin/src/components/buttons/Link.styles.js
+++ b/new-lamassu-admin/src/components/buttons/Link.styles.js
@@ -1,4 +1,4 @@
-import { fade } from '@material-ui/core/styles/colorManipulator'
+import { alpha } from '@material-ui/core/styles/colorManipulator'
import typographyStyles from 'src/components/typography/styles'
import {
@@ -11,10 +11,10 @@ import {
const { h4 } = typographyStyles
const color = color => ({
- boxShadow: `inset 0 -4px 0 0 ${fade(color, 0.8)}`,
+ boxShadow: `inset 0 -4px 0 0 ${alpha(color, 0.8)}`,
'&:hover': {
boxShadow: 'none',
- backgroundColor: fade(color, 0.8)
+ backgroundColor: alpha(color, 0.8)
}
})
diff --git a/new-lamassu-admin/src/components/buttons/SimpleButton.js b/new-lamassu-admin/src/components/buttons/SimpleButton.js
deleted file mode 100644
index 7e7bce12..00000000
--- a/new-lamassu-admin/src/components/buttons/SimpleButton.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import { makeStyles } from '@material-ui/core/styles'
-import classnames from 'classnames'
-import React, { memo } from 'react'
-
-import baseButtonStyles from './BaseButton.styles'
-
-const { baseButton, primary } = baseButtonStyles
-
-const styles = {
- button: {
- extend: baseButton,
- borderRadius: baseButton.height / 2,
- outline: 0,
- padding: '0 20px'
- },
- primary,
- buttonIcon: {
- marginTop: 4,
- marginRight: 4,
- '& svg': {
- width: 20,
- height: 20,
- overflow: 'visible'
- }
- },
- buttonIconActive: {} // required to extend primary
-}
-
-const useStyles = makeStyles(styles)
-
-const SimpleButton = memo(
- ({ className, Icon, InverseIcon, children, color, size, ...props }) => {
- const classes = useStyles()
-
- return (
-
- )
- }
-)
-
-export default SimpleButton
diff --git a/new-lamassu-admin/src/components/buttons/SubpageButton.js b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx
similarity index 94%
rename from new-lamassu-admin/src/components/buttons/SubpageButton.js
rename to new-lamassu-admin/src/components/buttons/SubpageButton.jsx
index 66a2b62d..f98b6d75 100644
--- a/new-lamassu-admin/src/components/buttons/SubpageButton.js
+++ b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx
@@ -1,9 +1,8 @@
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React, { memo, useState } from 'react'
-
import { H4 } from 'src/components/typography'
-import { ReactComponent as CancelIconInverse } from 'src/styling/icons/button/cancel/white.svg'
+import CancelIconInverse from 'src/styling/icons/button/cancel/white.svg?react'
import subpageButtonStyles from './SubpageButton.styles'
diff --git a/new-lamassu-admin/src/components/buttons/SupportLinkButton.js b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx
similarity index 80%
rename from new-lamassu-admin/src/components/buttons/SupportLinkButton.js
rename to new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx
index 296a50ab..12329fd3 100644
--- a/new-lamassu-admin/src/components/buttons/SupportLinkButton.js
+++ b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
+import InverseLinkIcon from 'src/styling/icons/action/external link/white.svg?react'
+import LinkIcon from 'src/styling/icons/action/external link/zodiac.svg?react'
import { ActionButton } from 'src/components/buttons'
-import { ReactComponent as InverseLinkIcon } from 'src/styling/icons/action/external link/white.svg'
-import { ReactComponent as LinkIcon } from 'src/styling/icons/action/external link/zodiac.svg'
import { spacer, primaryColor } from 'src/styling/variables'
const useStyles = makeStyles({
diff --git a/new-lamassu-admin/src/components/buttons/index.js b/new-lamassu-admin/src/components/buttons/index.js
index e0e34f7d..193587cb 100644
--- a/new-lamassu-admin/src/components/buttons/index.js
+++ b/new-lamassu-admin/src/components/buttons/index.js
@@ -6,14 +6,12 @@ import FeatureButton from './FeatureButton'
import IDButton from './IDButton'
import IconButton from './IconButton'
import Link from './Link'
-import SimpleButton from './SimpleButton'
import SubpageButton from './SubpageButton'
import SupportLinkButton from './SupportLinkButton'
export {
Button,
Link,
- SimpleButton,
ActionButton,
FeatureButton,
IconButton,
diff --git a/new-lamassu-admin/src/components/date-range-picker/Calendar.js b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx
similarity index 96%
rename from new-lamassu-admin/src/components/date-range-picker/Calendar.js
rename to new-lamassu-admin/src/components/date-range-picker/Calendar.jsx
index c0480530..27a3a4fb 100644
--- a/new-lamassu-admin/src/components/date-range-picker/Calendar.js
+++ b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx
@@ -15,10 +15,10 @@ import {
} from 'date-fns/fp'
import * as R from 'ramda'
import React, { useState } from 'react'
+import Arrow from 'src/styling/icons/arrow/month_change.svg?react'
+import RightArrow from 'src/styling/icons/arrow/month_change_right.svg?react'
import typographyStyles from 'src/components/typography/styles'
-import { ReactComponent as Arrow } from 'src/styling/icons/arrow/month_change.svg'
-import { ReactComponent as RightArrow } from 'src/styling/icons/arrow/month_change_right.svg'
import { primaryColor, zircon } from 'src/styling/variables'
import Tile from './Tile'
diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
rename to new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx
diff --git a/new-lamassu-admin/src/components/date-range-picker/Tile.js b/new-lamassu-admin/src/components/date-range-picker/Tile.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/date-range-picker/Tile.js
rename to new-lamassu-admin/src/components/date-range-picker/Tile.jsx
diff --git a/new-lamassu-admin/src/components/editableProperty/EditableProperty.js b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx
similarity index 91%
rename from new-lamassu-admin/src/components/editableProperty/EditableProperty.js
rename to new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx
index d3d822ab..28852792 100644
--- a/new-lamassu-admin/src/components/editableProperty/EditableProperty.js
+++ b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx
@@ -1,11 +1,11 @@
import { makeStyles } from '@material-ui/core/styles'
import React, { useState, memo } from 'react'
+import { H4, P } from 'src/components/typography'
+import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
import { Link } from 'src/components/buttons'
import { RadioGroup } from 'src/components/inputs'
-import { H4, P } from 'src/components/typography'
-import { ReactComponent as EditIconDisabled } from 'src/styling/icons/action/edit/disabled.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
import { editablePropertyStyles } from './EditableProperty.styles'
diff --git a/new-lamassu-admin/src/components/editableTable/Header.js b/new-lamassu-admin/src/components/editableTable/Header.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/editableTable/Header.js
rename to new-lamassu-admin/src/components/editableTable/Header.jsx
index 2c422e43..a6ef6143 100644
--- a/new-lamassu-admin/src/components/editableTable/Header.js
+++ b/new-lamassu-admin/src/components/editableTable/Header.jsx
@@ -2,13 +2,13 @@ import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useContext } from 'react'
-
import {
Td,
THead,
TDoubleLevelHead,
ThDoubleLevel
} from 'src/components/fake-table/Table'
+
import { sentenceCase } from 'src/utils/string'
import TableCtx from './Context'
diff --git a/new-lamassu-admin/src/components/editableTable/NamespacedTable.js b/new-lamassu-admin/src/components/editableTable/NamespacedTable.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/editableTable/NamespacedTable.js
rename to new-lamassu-admin/src/components/editableTable/NamespacedTable.jsx
diff --git a/new-lamassu-admin/src/components/editableTable/Row.js b/new-lamassu-admin/src/components/editableTable/Row.jsx
similarity index 90%
rename from new-lamassu-admin/src/components/editableTable/Row.js
rename to new-lamassu-admin/src/components/editableTable/Row.jsx
index 8e224934..43d8dcc7 100644
--- a/new-lamassu-admin/src/components/editableTable/Row.js
+++ b/new-lamassu-admin/src/components/editableTable/Row.jsx
@@ -1,298 +1,299 @@
-import { makeStyles } from '@material-ui/core'
-import classnames from 'classnames'
-import { Field, useFormikContext } from 'formik'
-import * as R from 'ramda'
-import React, { useContext, useState } from 'react'
-
-import { DeleteDialog } from 'src/components/DeleteDialog'
-import { Link, IconButton } from 'src/components/buttons'
-import { Td, Tr } from 'src/components/fake-table/Table'
-import { Switch } from 'src/components/inputs'
-import { Label2 } from 'src/components/typography'
-import { ReactComponent as DisabledDeleteIcon } from 'src/styling/icons/action/delete/disabled.svg'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
-import { ReactComponent as DisabledEditIcon } from 'src/styling/icons/action/edit/disabled.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
-import { ReactComponent as StripesSvg } from 'src/styling/icons/stripes.svg'
-
-import TableCtx from './Context'
-import styles from './Row.styles'
-
-const useStyles = makeStyles(styles)
-
-const ActionCol = ({ disabled, editing }) => {
- const classes = useStyles()
- const { values, submitForm, resetForm } = useFormikContext()
- const {
- editWidth,
- onEdit,
- enableEdit,
- enableDelete,
- disableRowEdit,
- onDelete,
- deleteWidth,
- enableToggle,
- onToggle,
- toggleWidth,
- forceAdd,
- clearError,
- actionColSize,
- error
- } = useContext(TableCtx)
-
- const disableEdit = disabled || (disableRowEdit && disableRowEdit(values))
- const cancel = () => {
- clearError()
- resetForm()
- }
-
- const [deleteDialog, setDeleteDialog] = useState(false)
-
- const onConfirmed = () => {
- onDelete(values.id).then(res => {
- if (!R.isNil(res)) setDeleteDialog(false)
- })
- }
-
- return (
- <>
- {editing && (
-
- {R.map(f => (
-
- {prefix && !isHidden(values) && (
-
- {typeof prefix === 'function' ? prefix(f) : prefix}
-
- )}
- {isEditing && isField && !isHidden(values) && (
-
- {suffix}
-
- )}
- {isHidden(values) &&
- ))(fields)}
-
- )
-}
-
-const groupStriped = elements => {
- const [toStripe, noStripe] = R.partition(R.propEq('stripe', true))(elements)
-
- if (!toStripe.length) {
- return elements
- }
-
- const index = R.indexOf(toStripe[0], elements)
- const width = R.compose(R.sum, R.map(R.path(['width'])))(toStripe)
-
- return R.insert(
- index,
- { width, editable: false, view: () =>
- {view(values[f], values)}
-
- )}
- {suffix && !isHidden(values) && (
-
+ {fields.map((f, idx) => (
+
+ {prefix && !isHidden(values) && (
+
+ {typeof prefix === 'function' ? prefix(f) : prefix}
+
+ )}
+ {isEditing && isField && !isHidden(values) && (
+
+ {suffix}
+
+ )}
+ {isHidden(values) &&
+ ))}
+
+ )
+}
+
+const groupStriped = elements => {
+ const [toStripe, noStripe] = R.partition(R.propEq('stripe', true))(elements)
+
+ if (!toStripe.length) {
+ return elements
+ }
+
+ const index = R.indexOf(toStripe[0], elements)
+ const width = R.compose(R.sum, R.map(R.path(['width'])))(toStripe)
+
+ return R.insert(
+ index,
+ { width, editable: false, view: () =>
+ {view(values[f], values)}
+
+ )}
+ {suffix && !isHidden(values) && (
+ Loading...
} {!loading && data?.map((it, idx) => ( - onClick(it)}>
+
onClick(it)}>
{
}
}, [data, stopPolling, timeout, timestamp])
- const path = `${URI}/operator-data/diagnostics/${deviceId}/`
+ const path = `/operator-data/diagnostics/${deviceId}/`
function runDiagnostics() {
startPolling(2000)
diff --git a/new-lamassu-admin/src/components/machineActions/MachineActions.js b/new-lamassu-admin/src/components/machineActions/MachineActions.jsx
similarity index 91%
rename from new-lamassu-admin/src/components/machineActions/MachineActions.js
rename to new-lamassu-admin/src/components/machineActions/MachineActions.jsx
index d62833a0..76fb7296 100644
--- a/new-lamassu-admin/src/components/machineActions/MachineActions.js
+++ b/new-lamassu-admin/src/components/machineActions/MachineActions.jsx
@@ -2,18 +2,17 @@ import { useMutation, useLazyQuery } from '@apollo/react-hooks'
import { makeStyles } from '@material-ui/core/styles'
import gql from 'graphql-tag'
import React, { memo, useState } from 'react'
-
import { ConfirmDialog } from 'src/components/ConfirmDialog'
import ActionButton from 'src/components/buttons/ActionButton'
import { H3 } from 'src/components/typography'
-import { ReactComponent as EditReversedIcon } from 'src/styling/icons/button/edit/white.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/button/edit/zodiac.svg'
-import { ReactComponent as RebootReversedIcon } from 'src/styling/icons/button/reboot/white.svg'
-import { ReactComponent as RebootIcon } from 'src/styling/icons/button/reboot/zodiac.svg'
-import { ReactComponent as ShutdownReversedIcon } from 'src/styling/icons/button/shut down/white.svg'
-import { ReactComponent as ShutdownIcon } from 'src/styling/icons/button/shut down/zodiac.svg'
-import { ReactComponent as UnpairReversedIcon } from 'src/styling/icons/button/unpair/white.svg'
-import { ReactComponent as UnpairIcon } from 'src/styling/icons/button/unpair/zodiac.svg'
+import EditReversedIcon from 'src/styling/icons/button/edit/white.svg?react'
+import EditIcon from 'src/styling/icons/button/edit/zodiac.svg?react'
+import RebootReversedIcon from 'src/styling/icons/button/reboot/white.svg?react'
+import RebootIcon from 'src/styling/icons/button/reboot/zodiac.svg?react'
+import ShutdownReversedIcon from 'src/styling/icons/button/shut down/white.svg?react'
+import ShutdownIcon from 'src/styling/icons/button/shut down/zodiac.svg?react'
+import UnpairReversedIcon from 'src/styling/icons/button/unpair/white.svg?react'
+import UnpairIcon from 'src/styling/icons/button/unpair/zodiac.svg?react'
import DiagnosticsModal from './DiagnosticsModal'
import { machineActionsStyles } from './MachineActions.styles'
diff --git a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx
similarity index 95%
rename from new-lamassu-admin/src/components/single-row-table/SingleRowTable.js
rename to new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx
index 5df9bbfa..ccb22539 100644
--- a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js
+++ b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx
@@ -1,8 +1,6 @@
import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import React from 'react'
-
-import { IconButton } from 'src/components/buttons'
import {
Table,
THead,
@@ -11,7 +9,9 @@ import {
Th,
Tr
} from 'src/components/fake-table/Table'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/white.svg'
+import EditIcon from 'src/styling/icons/action/edit/white.svg?react'
+
+import { IconButton } from 'src/components/buttons'
import styles from './SingleRowTable.styles'
diff --git a/new-lamassu-admin/src/components/table/EditCell.js b/new-lamassu-admin/src/components/table/EditCell.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/EditCell.js
rename to new-lamassu-admin/src/components/table/EditCell.jsx
diff --git a/new-lamassu-admin/src/components/table/EmptyTable.js b/new-lamassu-admin/src/components/table/EmptyTable.jsx
similarity index 86%
rename from new-lamassu-admin/src/components/table/EmptyTable.js
rename to new-lamassu-admin/src/components/table/EmptyTable.jsx
index a7d991de..b755c746 100644
--- a/new-lamassu-admin/src/components/table/EmptyTable.js
+++ b/new-lamassu-admin/src/components/table/EmptyTable.jsx
@@ -1,9 +1,8 @@
import { makeStyles } from '@material-ui/core'
import classNames from 'classnames'
import React, { memo } from 'react'
-
import { H4 } from 'src/components/typography'
-import { ReactComponent as EmptyTableIcon } from 'src/styling/icons/table/empty-table.svg'
+import EmptyTableIcon from 'src/styling/icons/table/empty-table.svg?react'
const styles = {
emptyTable: {
diff --git a/new-lamassu-admin/src/components/table/Table.js b/new-lamassu-admin/src/components/table/Table.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/Table.js
rename to new-lamassu-admin/src/components/table/Table.jsx
diff --git a/new-lamassu-admin/src/components/table/TableBody.js b/new-lamassu-admin/src/components/table/TableBody.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/TableBody.js
rename to new-lamassu-admin/src/components/table/TableBody.jsx
diff --git a/new-lamassu-admin/src/components/table/TableCell.js b/new-lamassu-admin/src/components/table/TableCell.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/TableCell.js
rename to new-lamassu-admin/src/components/table/TableCell.jsx
diff --git a/new-lamassu-admin/src/components/table/TableHead.js b/new-lamassu-admin/src/components/table/TableHead.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/TableHead.js
rename to new-lamassu-admin/src/components/table/TableHead.jsx
diff --git a/new-lamassu-admin/src/components/table/TableHeader.js b/new-lamassu-admin/src/components/table/TableHeader.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/TableHeader.js
rename to new-lamassu-admin/src/components/table/TableHeader.jsx
diff --git a/new-lamassu-admin/src/components/table/TableRow.js b/new-lamassu-admin/src/components/table/TableRow.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/table/TableRow.js
rename to new-lamassu-admin/src/components/table/TableRow.jsx
diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.jsx
similarity index 96%
rename from new-lamassu-admin/src/components/tables/DataTable.js
rename to new-lamassu-admin/src/components/tables/DataTable.jsx
index 63d0d6f7..30b18758 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.jsx
@@ -8,7 +8,6 @@ import {
CellMeasurer,
CellMeasurerCache
} from 'react-virtualized'
-
import {
Table,
TBody,
@@ -17,10 +16,11 @@ import {
Td,
Th
} from 'src/components/fake-table/Table'
-import { EmptyTable } from 'src/components/table'
import { H4 } from 'src/components/typography'
-import { ReactComponent as ExpandClosedIcon } from 'src/styling/icons/action/expand/closed.svg'
-import { ReactComponent as ExpandOpenIcon } from 'src/styling/icons/action/expand/open.svg'
+import ExpandClosedIcon from 'src/styling/icons/action/expand/closed.svg?react'
+import ExpandOpenIcon from 'src/styling/icons/action/expand/open.svg?react'
+
+import { EmptyTable } from 'src/components/table'
import styles from './DataTable.styles'
diff --git a/new-lamassu-admin/src/components/tables/Stripes.js b/new-lamassu-admin/src/components/tables/Stripes.jsx
similarity index 70%
rename from new-lamassu-admin/src/components/tables/Stripes.js
rename to new-lamassu-admin/src/components/tables/Stripes.jsx
index 59cf8ce6..6f84869e 100644
--- a/new-lamassu-admin/src/components/tables/Stripes.js
+++ b/new-lamassu-admin/src/components/tables/Stripes.jsx
@@ -1,7 +1,6 @@
import React from 'react'
-
import { Td } from 'src/components/fake-table/Table'
-import { ReactComponent as StripesSvg } from 'src/styling/icons/stripes.svg'
+import StripesSvg from 'src/styling/icons/stripes.svg?react'
const Stripes = ({ width }) => (
diff --git a/new-lamassu-admin/src/components/typography/index.js b/new-lamassu-admin/src/components/typography/index.jsx
similarity index 100%
rename from new-lamassu-admin/src/components/typography/index.js
rename to new-lamassu-admin/src/components/typography/index.jsx
diff --git a/new-lamassu-admin/src/index.js b/new-lamassu-admin/src/index.js
deleted file mode 100644
index 8272c102..00000000
--- a/new-lamassu-admin/src/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-
-import App from './App'
-import * as serviceWorker from './serviceWorker'
-
-function checkBuildTarget() {
- const buildTarget = process.env.REACT_APP_BUILD_TARGET
-
- if (buildTarget !== 'LAMASSU' && buildTarget !== 'PAZUZ') {
- return Promise.reject(
- new Error('No such build target: ' + process.env.REACT_APP_BUILD_TARGET)
- )
- }
-
- return Promise.resolve()
-}
-
-checkBuildTarget().then(() =>
- ReactDOM.render(
-
- ,
- document.getElementById('root')
- )
-)
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister()
diff --git a/new-lamassu-admin/src/index.jsx b/new-lamassu-admin/src/index.jsx
new file mode 100644
index 00000000..638af18d
--- /dev/null
+++ b/new-lamassu-admin/src/index.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+import ReactDOM from 'react-dom'
+
+import App from './App'
+
+ReactDOM.render(
+
+ ,
+ document.getElementById('root')
+)
diff --git a/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js b/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js
deleted file mode 100644
index b9601108..00000000
--- a/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js
+++ /dev/null
@@ -1,258 +0,0 @@
-import { useQuery } from '@apollo/react-hooks'
-import { Paper } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
-import BigNumber from 'bignumber.js'
-import classnames from 'classnames'
-import gql from 'graphql-tag'
-import * as R from 'ramda'
-import React, { useContext } from 'react'
-
-import AppContext from 'src/AppContext'
-import TitleSection from 'src/components/layout/TitleSection'
-import { H3, Info2, Label2, Label3, P } from 'src/components/typography'
-import { ReactComponent as BitcoinLogo } from 'src/styling/logos/icon-bitcoin-colour.svg'
-import { ReactComponent as BitcoinCashLogo } from 'src/styling/logos/icon-bitcoincash-colour.svg'
-import { ReactComponent as DashLogo } from 'src/styling/logos/icon-dash-colour.svg'
-import { ReactComponent as EthereumLogo } from 'src/styling/logos/icon-ethereum-colour.svg'
-import { ReactComponent as LitecoinLogo } from 'src/styling/logos/icon-litecoin-colour.svg'
-import { ReactComponent as ZCashLogo } from 'src/styling/logos/icon-zcash-colour.svg'
-import { numberToFiatAmount, numberToCryptoAmount } from 'src/utils/number'
-
-import styles from './ATMWallet.styles'
-
-const useStyles = makeStyles(styles)
-
-const GET_OPERATOR_BY_USERNAME = gql`
- query operatorByUsername($username: String) {
- operatorByUsername(username: $username) {
- id
- entityId
- name
- fiatBalances
- cryptoBalances
- machines
- joined
- assets
- preferredFiatCurrency
- contactInfo {
- name
- email
- }
- fundings {
- id
- origin
- destination
- fiatAmount
- fiatBalanceAfter
- fiatCurrency
- created
- status
- description
- }
- }
- }
-`
-
-const CHIPS_PER_ROW = 6
-
-const Assets = ({ balance, wallets, currency }) => {
- const classes = useStyles({ numberOfChips: CHIPS_PER_ROW })
-
- const walletFiatSum = R.sum(R.map(it => it.fiatValue, wallets))
- const totalValue = BigNumber(balance)
- .plus(walletFiatSum)
- .toNumber()
-
- return (
-
-
- )}
-
- )
- }
- },
- {
- header: 'Amount',
- width: 147,
- size: 'sm',
- textAlign: 'right',
- view: it =>
- `${numberToFiatAmount(it.fiatAmount)} ${R.toUpper(it.fiatCurrency)}`
- },
- {
- header: 'Balance after operation',
- width: 250,
- size: 'sm',
- textAlign: 'right',
- view: it =>
- `${numberToFiatAmount(it.fiatBalanceAfter)} ${R.toUpper(
- it.fiatCurrency
- )}`
- },
- {
- header: 'Date',
- width: 150,
- size: 'sm',
- textAlign: 'right',
- view: it => formatDate(it.created, timezone, 'yyyy-MM-dd')
- },
- {
- header: 'Time',
- width: 150,
- size: 'sm',
- textAlign: 'right',
- view: it => formatDate(it.created, timezone, 'yyyy-MM-dd')
- }
- ]
-
- const hedgingReserve = BigNumber(
- R.reduce(
- (acc, value) => acc.plus(value),
- BigNumber(0),
- R.values(operatorData?.assets.values.hedgedContracts) ?? []
- ) ?? 0
- ).toNumber()
-
- return (
- !loading && (
- <>
-
-
-
-
-
-
-
- )
-}
-
-const Assets = () => {
- const classes = useStyles()
- const { userData } = useContext(AppContext)
-
- const { data, loading } = useQuery(GET_OPERATOR_BY_USERNAME, {
- context: { clientName: 'pazuz' },
- variables: { username: userData?.username }
- })
-
- const operatorData = R.path(['operatorByUsername'], data)
-
- const balanceData = [
- {
- id: 'fiatBalance',
- display: 'Fiat balance',
- amount: operatorData?.assets.total ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- class: 'Available balance'
- },
- {
- id: 'hedgingReserve',
- display: 'Hedging reserve',
- amount:
- -R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- class: 'Available balance',
- direction: 'out'
- }
- ]
-
- const walletData = [
- {
- id: 'hedgedWalletAssets',
- display: 'Hedged wallet assets',
- amount: R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- class: 'Wallet assets',
- direction: 'in'
- },
- {
- id: 'unhedgedWalletAssets',
- display: 'Unhedged wallet assets',
- amount: R.sum(R.values(operatorData?.assets.values.unhedgedFiat)) ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- class: 'Wallet assets',
- direction: 'in'
- }
- ]
-
- const totalData = [
- {
- id: 'fiatBalance',
- display: 'Fiat balance',
- amount:
- operatorData?.fiatBalances[operatorData?.preferredFiatCurrency] ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? '')
- },
- {
- id: 'hedgingReserve',
- display: 'Hedging reserve',
- amount:
- -R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- direction: 'out'
- },
- {
- id: 'hedgedWalletAssets',
- display: 'Market value of hedged wallet assets',
- amount: R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- direction: 'in'
- },
- {
- id: 'unhedgedWalletAssets',
- display: 'Unhedged wallet assets',
- amount: R.sum(R.values(operatorData?.assets.values.unhedgedFiat)) ?? 0,
- currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
- direction: 'in'
- }
- ]
-
- return (
- !loading && (
- <>
- setListView(false)}
- />
- setListView(true)}>
-
- )}
+ {
+ // TODO: Remove false condition for next release
+ // false && (
+ // <>
+ // setListView(false)}
+ // />
+ // setListView(true)}>
+ //
+ // )
+ }
- +
- =
-
- )
-}
-
-const WalletInfoChip = ({ wallet, currency }) => {
- const classes = useStyles({ numberOfChips: CHIPS_PER_ROW })
-
- const getLogo = cryptoCode => {
- switch (cryptoCode) {
- case 'BTC':
- return
-
- Available balance
-
-
- {numberToFiatAmount(balance)}
-
-
- {R.toUpper(currency)}
-
-
-
-
- Total balance in wallets
-
-
- {numberToFiatAmount(walletFiatSum)}
-
-
- {R.toUpper(currency)}
-
-
-
-
- Total assets
-
-
- {numberToFiatAmount(totalValue)}
-
-
- {R.toUpper(currency)}
-
-
-
-
-
-
- )
-}
-
-const ATMWallet = () => {
- const classes = useStyles({ numberOfChips: CHIPS_PER_ROW })
- const { userData } = useContext(AppContext)
-
- const { data, loading } = useQuery(GET_OPERATOR_BY_USERNAME, {
- context: { clientName: 'pazuz' },
- variables: { username: userData?.username }
- })
-
- const operatorData = R.path(['operatorByUsername'], data)
-
- const wallets = [
- {
- cryptoCode: 'BTC',
- name: 'Bitcoin',
- amount: operatorData?.cryptoBalances.xbt ?? 0,
- fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.xbt ?? 0,
- hedgedFiatValue: operatorData?.assets.values.hedgedContracts.xbt ?? 0,
- isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.xbt ?? 0).gt(
- 0
- )
- },
- {
- cryptoCode: 'ETH',
- name: 'Ethereum',
- amount: operatorData?.cryptoBalances.eth ?? 0,
- fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.eth ?? 0,
- hedgedFiatValue: operatorData?.assets.values.hedgedContracts.eth ?? 0,
- isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.eth ?? 0).gt(
- 0
- )
- },
- {
- cryptoCode: 'LTC',
- name: 'Litecoin',
- amount: operatorData?.cryptoBalances.ltc ?? 0,
- fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.ltc ?? 0,
- hedgedFiatValue: operatorData?.assets.values.hedgedContracts.ltc ?? 0,
- isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.ltc ?? 0).gt(
- 0
- )
- },
- {
- cryptoCode: 'ZEC',
- name: 'Zcash',
- amount: operatorData?.cryptoBalances.zec ?? 0,
- fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.zec ?? 0,
- hedgedFiatValue: operatorData?.assets.values.hedgedContracts.zec ?? 0,
- isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.zec ?? 0).gt(
- 0
- )
- },
- {
- cryptoCode: 'BCH',
- name: 'Bitcoin Cash',
- amount: operatorData?.cryptoBalances.bch ?? 0,
- fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.bch ?? 0,
- hedgedFiatValue: operatorData?.assets.values.hedgedContracts.bch ?? 0,
- isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.bch ?? 0).gt(
- 0
- )
- },
- {
- cryptoCode: 'DASH',
- name: 'Dash',
- amount: operatorData?.cryptoBalances.dash ?? 0,
- fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.dash ?? 0,
- hedgedFiatValue: operatorData?.assets.values.hedgedContracts.dash ?? 0,
- isHedged: BigNumber(
- operatorData?.assets.values.hedgedCrypto.dash ?? 0
- ).gt(0)
- }
- ]
-
- return (
- !loading && (
- <>
-
- {getLogo(wallet.cryptoCode)}
-
- {wallet.isHedged ? 'Hedged' : 'Not hedged'}
-
-
-
- {wallet.name} value
-
- {numberToCryptoAmount(wallet.amount)} {wallet.cryptoCode}
-
- Hedged value
-
- {numberToFiatAmount(wallet.hedgedFiatValue)} {currency}
-
-
- ATM Wallets
-
- {R.map(
- it => (
-
-
- )
- )
-}
-
-export default ATMWallet
diff --git a/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.styles.js b/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.styles.js
deleted file mode 100644
index 8715a627..00000000
--- a/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.styles.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { offColor } from 'src/styling/variables'
-
-const styles = ({ numberOfChips }) => ({
- totalAssetWrapper: {
- display: 'flex',
- flexDirection: 'row'
- },
- totalAssetFieldWrapper: {
- display: 'flex',
- flexDirection: 'column'
- },
- fieldHeader: {
- color: offColor,
- marginBottom: 5
- },
- fieldValue: {
- fontSize: 36
- },
- fieldCurrency: {
- fontSize: 20,
- alignSelf: 'flex-end',
- margin: [[0, 0, 5, 5]]
- },
- separator: {
- fontSize: 32,
- alignSelf: 'center',
- margin: [[25, 20, 0, 20]]
- },
- walletChipList: {
- display: 'flex',
- flexDirection: 'row',
- flexWrap: 'wrap'
- },
- walletChipWrapper: {
- flexGrow: 0,
- flexShrink: 0,
- flexBasis: `16.66667%`,
- '&:nth-child(6n+1)': {
- '& > div': {
- margin: [[0, 10, 0, 0]]
- }
- },
- '&:nth-child(6n)': {
- '& > div': {
- margin: [[0, 0, 0, 10]]
- }
- },
- margin: [[10, 0]]
- },
- walletChip: {
- height: 200,
- margin: [[0, 10]]
- },
- walletHeader: {
- display: 'flex',
- flexDirection: 'row',
- justifyContent: 'space-between',
- height: 50
- },
- logo: {
- transform: `scale(0.4, 0.4)`,
- height: 80,
- maxWidth: 110,
- margin: [[-14, 0, 0, -26]]
- },
- zecLogo: {
- margin: [[-15, 0, 0, -10]]
- },
- bchLogo: {
- margin: [[-12, 0, 0, -18]]
- },
- hedgedText: {
- color: offColor,
- margin: [[13, 12, 0, 0]]
- },
- walletValueWrapper: {
- display: 'flex',
- flexDirection: 'column',
- margin: [[0, 0, 0, 15]]
- },
- walletValue: {
- fontSize: 18,
- margin: [[0, 0, 10, 0]]
- },
- walletChipTitle: {
- marginTop: 50
- }
-})
-
-export default styles
diff --git a/new-lamassu-admin/src/pages/Accounting/Accounting.js b/new-lamassu-admin/src/pages/Accounting/Accounting.js
deleted file mode 100644
index dcc6b18d..00000000
--- a/new-lamassu-admin/src/pages/Accounting/Accounting.js
+++ /dev/null
@@ -1,203 +0,0 @@
-import { useQuery } from '@apollo/react-hooks'
-import { makeStyles } from '@material-ui/core/styles'
-import BigNumber from 'bignumber.js'
-import gql from 'graphql-tag'
-import * as R from 'ramda'
-import React, { useContext } from 'react'
-
-import AppContext from 'src/AppContext'
-import { HelpTooltip } from 'src/components/Tooltip'
-import TitleSection from 'src/components/layout/TitleSection'
-import DataTable from 'src/components/tables/DataTable'
-import { H4, Info2, P } from 'src/components/typography'
-import { numberToFiatAmount } from 'src/utils/number'
-import { formatDate } from 'src/utils/timezones'
-
-import styles from './Accounting.styles'
-
-const useStyles = makeStyles(styles)
-
-const GET_OPERATOR_BY_USERNAME = gql`
- query operatorByUsername($username: String) {
- operatorByUsername(username: $username) {
- id
- entityId
- name
- fiatBalances
- cryptoBalances
- machines
- joined
- assets
- preferredFiatCurrency
- contactInfo {
- name
- email
- }
- fundings {
- id
- origin
- destination
- fiatAmount
- fiatBalanceAfter
- fiatCurrency
- created
- status
- description
- }
- }
- }
-`
-
-const GET_DATA = gql`
- query getData {
- config
- }
-`
-
-const Assets = ({ balance, hedgingReserve, currency }) => {
- const classes = useStyles()
-
- return (
-
- -
- =
-
- )
-}
-
-const Accounting = () => {
- const classes = useStyles()
- const { userData } = useContext(AppContext)
-
- const { data: opData, loading: operatorLoading } = useQuery(
- GET_OPERATOR_BY_USERNAME,
- {
- context: { clientName: 'pazuz' },
- variables: { username: userData?.username }
- }
- )
-
- const { data: configResponse, loading: configLoading } = useQuery(GET_DATA)
- const timezone = R.path(['config', 'locale_timezone'], configResponse)
-
- const loading = operatorLoading || configLoading
-
- const operatorData = R.path(['operatorByUsername'], opData)
-
- const elements = [
- {
- header: 'Operation',
- width: 500,
- size: 'sm',
- textAlign: 'left',
- view: it => {
- return (
-
- {it.description}
- {!!it.extraInfo && (
-
-
- Pazuz fiat balance
-
-
- {numberToFiatAmount(balance)}
-
-
- {R.toUpper(currency)}
-
-
-
-
- Hedging reserve
-
-
- {numberToFiatAmount(hedgingReserve)}
-
-
- {R.toUpper(currency)}
-
-
-
-
- Available balance
-
-
- {numberToFiatAmount(balance - hedgingReserve)}
-
-
- {R.toUpper(currency)}
-
-
- {it.extraInfo}
-Fiat balance history
-{title}
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
- )
-}
-
-export default Assets
diff --git a/new-lamassu-admin/src/pages/Assets/Assets.styles.js b/new-lamassu-admin/src/pages/Assets/Assets.styles.js
deleted file mode 100644
index eea2e084..00000000
--- a/new-lamassu-admin/src/pages/Assets/Assets.styles.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import {
- white,
- offColor,
- backgroundColor,
- subheaderColor
-} from 'src/styling/variables'
-
-const styles = () => ({
- card: {
- wordWrap: 'break-word',
- boxShadow: '0 0 4px 0 rgba(0, 0, 0, 0.08)',
- borderRadius: 12,
- padding: 24,
- backgroundColor: white
- },
- h4: {
- marginTop: 0
- },
- label: {
- margin: 0,
- color: offColor
- },
- asset: {
- float: 'left'
- },
- amount: {
- float: 'right'
- },
- row: {
- backgroundColor: backgroundColor,
- borderBottom: 'none'
- },
- totalRow: {
- backgroundColor: subheaderColor,
- borderBottom: 'none'
- },
- leftSide: {
- margin: [[0, 10, 20, 0]]
- },
- rightSide: {
- margin: [[0, 0, 0, 10]]
- }
-})
-
-export default styles
diff --git a/new-lamassu-admin/src/pages/AuthRegister.js b/new-lamassu-admin/src/pages/AuthRegister.jsx
similarity index 80%
rename from new-lamassu-admin/src/pages/AuthRegister.js
rename to new-lamassu-admin/src/pages/AuthRegister.jsx
index 25a2f714..b4499d34 100644
--- a/new-lamassu-admin/src/pages/AuthRegister.js
+++ b/new-lamassu-admin/src/pages/AuthRegister.jsx
@@ -3,15 +3,13 @@ import React from 'react'
import { useLocation, useHistory } from 'react-router-dom'
const useQuery = () => new URLSearchParams(useLocation().search)
-const url =
- process.env.NODE_ENV === 'development' ? 'https://localhost:8070' : ''
const AuthRegister = () => {
const history = useHistory()
const query = useQuery()
useAxios({
- url: `${url}/api/register?otp=${query.get('otp')}`,
+ url: `/api/register?otp=${query.get('otp')}`,
method: 'GET',
options: {
withCredentials: true
diff --git a/new-lamassu-admin/src/pages/Authentication/Input2FAState.js b/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Authentication/Input2FAState.js
rename to new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx
index 31deaf63..3a6df987 100644
--- a/new-lamassu-admin/src/pages/Authentication/Input2FAState.js
+++ b/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx
@@ -1,15 +1,14 @@
import { useMutation, useLazyQuery } from '@apollo/react-hooks'
import { makeStyles } from '@material-ui/core/styles'
-import base64 from 'base-64'
import { Form, Formik } from 'formik'
import gql from 'graphql-tag'
import React, { useContext, useState } from 'react'
import { useHistory } from 'react-router-dom'
+import { TL1, P } from 'src/components/typography'
import AppContext from 'src/AppContext'
import { Button } from 'src/components/buttons'
import { CodeInput } from 'src/components/inputs/base'
-import { TL1, P } from 'src/components/typography'
import styles from './shared.styles'
import { STATES } from './states'
@@ -59,14 +58,7 @@ const Input2FAState = ({ state, dispatch }) => {
const [input2FA, { error: mutationError }] = useMutation(INPUT_2FA, {
onCompleted: ({ input2FA: success }) => {
if (success) {
- const options = {
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': base64.encode(state.clientField)
- }
- }
- }
- return getUserData(options)
+ return getUserData()
}
return setInvalidToken(true)
}
@@ -94,11 +86,6 @@ const Input2FAState = ({ state, dispatch }) => {
password: state.passwordField,
code: state.twoFAField,
rememberMe: state.rememberMeField
- },
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': base64.encode(state.clientField)
- }
}
}
diff --git a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Authentication/InputFIDOState.js
rename to new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx
index 4352a492..4f560a7f 100644
--- a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js
+++ b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx
@@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik'
import gql from 'graphql-tag'
import React, { useState, useContext } from 'react'
import { useHistory } from 'react-router-dom'
+import { H2, Label2, P } from 'src/components/typography'
import * as Yup from 'yup'
import AppContext from 'src/AppContext'
import { Button } from 'src/components/buttons'
import { Checkbox, TextInput } from 'src/components/inputs/formik'
-import { H2, Label2, P } from 'src/components/typography'
import styles from './shared.styles'
diff --git a/new-lamassu-admin/src/pages/Authentication/Login.js b/new-lamassu-admin/src/pages/Authentication/Login.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Authentication/Login.js
rename to new-lamassu-admin/src/pages/Authentication/Login.jsx
diff --git a/new-lamassu-admin/src/pages/Authentication/LoginCard.js b/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Authentication/LoginCard.js
rename to new-lamassu-admin/src/pages/Authentication/LoginCard.jsx
index e1dc5aef..571167e4 100644
--- a/new-lamassu-admin/src/pages/Authentication/LoginCard.js
+++ b/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx
@@ -1,9 +1,8 @@
import Paper from '@material-ui/core/Paper'
import { makeStyles } from '@material-ui/core/styles'
import React, { useReducer } from 'react'
-
import { H5 } from 'src/components/typography'
-import { ReactComponent as Logo } from 'src/styling/icons/menu/logo.svg'
+import Logo from 'src/styling/icons/menu/logo.svg?react'
import Input2FAState from './Input2FAState'
import InputFIDOState from './InputFIDOState'
diff --git a/new-lamassu-admin/src/pages/Authentication/LoginState.js b/new-lamassu-admin/src/pages/Authentication/LoginState.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Authentication/LoginState.js
rename to new-lamassu-admin/src/pages/Authentication/LoginState.jsx
index 1716919b..7d157c4b 100644
--- a/new-lamassu-admin/src/pages/Authentication/LoginState.js
+++ b/new-lamassu-admin/src/pages/Authentication/LoginState.jsx
@@ -1,17 +1,16 @@
import { useMutation, useLazyQuery } from '@apollo/react-hooks'
import { makeStyles } from '@material-ui/core/styles'
import { startAssertion } from '@simplewebauthn/browser'
-import base64 from 'base-64'
import { Field, Form, Formik } from 'formik'
import gql from 'graphql-tag'
import React, { useContext } from 'react'
import { useHistory } from 'react-router-dom'
+import { Label3, P } from 'src/components/typography'
import * as Yup from 'yup'
import AppContext from 'src/AppContext'
import { Button } from 'src/components/buttons'
import { Checkbox, SecretInput, TextInput } from 'src/components/inputs/formik'
-import { Label3, P } from 'src/components/typography'
import styles from './shared.styles'
@@ -49,10 +48,7 @@ const GET_USER_DATA = gql`
`
const validationSchema = Yup.object().shape({
- email: Yup.string()
- .label('Email')
- .required()
- .email(),
+ email: Yup.string().label('Email').required().email(),
password: Yup.string().required('Password field is required'),
rememberMe: Yup.boolean()
})
@@ -84,11 +80,6 @@ const LoginState = ({ state, dispatch, strategy }) => {
variables: {
username,
password
- },
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': base64.encode(username)
- }
}
}
const { data: loginResponse } = await login(options)
diff --git a/new-lamassu-admin/src/pages/Authentication/Register.js b/new-lamassu-admin/src/pages/Authentication/Register.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Authentication/Register.js
rename to new-lamassu-admin/src/pages/Authentication/Register.jsx
index f9e24e5f..c6982ad1 100644
--- a/new-lamassu-admin/src/pages/Authentication/Register.js
+++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx
@@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik'
import gql from 'graphql-tag'
import React, { useReducer } from 'react'
import { useLocation, useHistory } from 'react-router-dom'
+import { H2, Label3, P } from 'src/components/typography'
+import Logo from 'src/styling/icons/menu/logo.svg?react'
import * as Yup from 'yup'
import { Button } from 'src/components/buttons'
import { SecretInput } from 'src/components/inputs/formik'
-import { H2, Label3, P } from 'src/components/typography'
-import { ReactComponent as Logo } from 'src/styling/icons/menu/logo.svg'
import styles from './shared.styles'
@@ -90,16 +90,10 @@ const Register = () => {
const classes = useStyles()
const history = useHistory()
const token = QueryParams().get('t')
- const identifier = QueryParams().get('id') ?? null
const [state, dispatch] = useReducer(reducer, initialState)
const queryOptions = {
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': identifier
- }
- },
variables: { token: token },
onCompleted: ({ validateRegisterLink: info }) => {
if (!info) {
diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.js b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Authentication/Reset2FA.js
rename to new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
index bf7c4a2f..6717b755 100644
--- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.js
+++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
@@ -6,11 +6,11 @@ import gql from 'graphql-tag'
import QRCode from 'qrcode.react'
import React, { useReducer, useState } from 'react'
import { useLocation, useHistory } from 'react-router-dom'
+import { H2, Label2, Label3, P } from 'src/components/typography'
+import Logo from 'src/styling/icons/menu/logo.svg?react'
import { ActionButton, Button } from 'src/components/buttons'
import { CodeInput } from 'src/components/inputs/base'
-import { H2, Label2, Label3, P } from 'src/components/typography'
-import { ReactComponent as Logo } from 'src/styling/icons/menu/logo.svg'
import { primaryColor } from 'src/styling/variables'
import styles from './shared.styles'
diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.js b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Authentication/ResetPassword.js
rename to new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
index bd04d4bb..0b6c6111 100644
--- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.js
+++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
@@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik'
import gql from 'graphql-tag'
import React, { useState } from 'react'
import { useLocation, useHistory } from 'react-router-dom'
+import { H2, Label3, P } from 'src/components/typography'
+import Logo from 'src/styling/icons/menu/logo.svg?react'
import * as Yup from 'yup'
import { Button } from 'src/components/buttons'
import { SecretInput } from 'src/components/inputs/formik/'
-import { H2, Label3, P } from 'src/components/typography'
-import { ReactComponent as Logo } from 'src/styling/icons/menu/logo.svg'
import styles from './shared.styles'
diff --git a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.js b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx
similarity index 91%
rename from new-lamassu-admin/src/pages/Authentication/Setup2FAState.js
rename to new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx
index 618ed89e..40a6a3e9 100644
--- a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.js
+++ b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx
@@ -1,16 +1,15 @@
import { useMutation, useQuery, useLazyQuery } from '@apollo/react-hooks'
import { makeStyles } from '@material-ui/core/styles'
-import base64 from 'base-64'
import { Form, Formik } from 'formik'
import gql from 'graphql-tag'
import QRCode from 'qrcode.react'
import React, { useContext, useState } from 'react'
import { useHistory } from 'react-router-dom'
+import { Label3, P } from 'src/components/typography'
import AppContext from 'src/AppContext'
import { ActionButton, Button } from 'src/components/buttons'
import { CodeInput } from 'src/components/inputs/base'
-import { Label3, P } from 'src/components/typography'
import { primaryColor } from 'src/styling/variables'
import styles from './shared.styles'
@@ -71,11 +70,6 @@ const Setup2FAState = ({ state, dispatch }) => {
const queryOptions = {
variables: { username: state.clientField, password: state.passwordField },
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': base64.encode(state.clientField)
- }
- },
onCompleted: ({ get2FASecret }) => {
setSecret(get2FASecret.secret)
setOtpauth(get2FASecret.otpauth)
@@ -88,11 +82,6 @@ const Setup2FAState = ({ state, dispatch }) => {
password: state.passwordField,
rememberMe: state.rememberMeField,
codeConfirmation: twoFAConfirmation
- },
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': base64.encode(state.clientField)
- }
}
}
@@ -107,14 +96,7 @@ const Setup2FAState = ({ state, dispatch }) => {
const [setup2FA, { error: mutationError }] = useMutation(SETUP_2FA, {
onCompleted: ({ setup2FA: success }) => {
- const options = {
- context: {
- headers: {
- 'Pazuz-Operator-Identifier': base64.encode(state.clientField)
- }
- }
- }
- success ? getUserData(options) : setInvalidToken(true)
+ success ? getUserData() : setInvalidToken(true)
}
})
diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Blacklist/Blacklist.js
rename to new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
index 5e0e0ab0..9b7c6d02 100644
--- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
+++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
@@ -1,19 +1,18 @@
import { useQuery, useMutation } from '@apollo/react-hooks'
-import { addressDetector } from '@lamassu/coins'
import { Box, Dialog, DialogContent, DialogActions } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { HelpTooltip } from 'src/components/Tooltip'
-import { Link, Button, IconButton } from 'src/components/buttons'
-import { Switch } from 'src/components/inputs'
import TitleSection from 'src/components/layout/TitleSection'
import { H2, Label2, P, Info3, Info2 } from 'src/components/typography'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
-import { ReactComponent as ReverseSettingsIcon } from 'src/styling/icons/circle buttons/settings/white.svg'
-import { ReactComponent as SettingsIcon } from 'src/styling/icons/circle buttons/settings/zodiac.svg'
+import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
+import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white.svg?react'
+import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react'
+
+import { Link, Button, IconButton } from 'src/components/buttons'
+import { Switch } from 'src/components/inputs'
import { fromNamespace, toNamespace } from 'src/utils/config'
import styles from './Blacklist.styles'
@@ -145,7 +144,6 @@ const Blacklist = () => {
})
const [addEntry] = useMutation(ADD_ROW, {
- onError: () => console.log('Error while adding row'),
refetchQueries: () => ['getBlacklistData']
})
@@ -185,32 +183,22 @@ const Blacklist = () => {
setConfirmDialog(false)
}
- const validateAddress = address => {
- try {
- return !R.isEmpty(
- addressDetector.getSupportedCoinsForAddress(address).matches
- )
- } catch {
- return false
- }
- }
-
const addToBlacklist = async address => {
setErrorMsg(null)
- if (!validateAddress(address)) {
- setErrorMsg('Invalid address')
- return
- }
- const res = await addEntry({ variables: { address } })
- if (!res.errors) {
- return setShowModal(false)
- }
- const duplicateKeyError = res.errors.some(e => {
- return e.message.includes('duplicate')
- })
- if (duplicateKeyError) {
- setErrorMsg('This address is already being blocked')
- } else {
+ try {
+ const res = await addEntry({ variables: { address } })
+ if (!res?.errors) {
+ return setShowModal(false)
+ }
+ const duplicateKeyError = res?.errors?.some(e => {
+ return e.message.includes('duplicate')
+ })
+ if (duplicateKeyError) {
+ setErrorMsg('This address is already being blocked')
+ } else {
+ setErrorMsg(`Server error${': ' + res?.errors[0]?.message}`)
+ }
+ } catch (e) {
setErrorMsg('Server error')
}
}
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js
rename to new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx
index f3790959..b29a3ad4 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx
@@ -2,18 +2,18 @@ import { makeStyles } from '@material-ui/core/styles'
import { Form, Formik, Field } from 'formik'
import * as R from 'ramda'
import React, { useState } from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
+import DataTable from 'src/components/tables/DataTable'
+import DisabledDeleteIcon from 'src/styling/icons/action/delete/disabled.svg?react'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
+import DefaultIconReverse from 'src/styling/icons/button/retry/white.svg?react'
+import DefaultIcon from 'src/styling/icons/button/retry/zodiac.svg?react'
+import * as Yup from 'yup'
+
import { ActionButton, IconButton, Button } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs/formik'
-import DataTable from 'src/components/tables/DataTable'
-import { ReactComponent as DisabledDeleteIcon } from 'src/styling/icons/action/delete/disabled.svg'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
-import { ReactComponent as DefaultIconReverse } from 'src/styling/icons/button/retry/white.svg'
-import { ReactComponent as DefaultIcon } from 'src/styling/icons/button/retry/zodiac.svg'
import styles from './Blacklist.styles'
@@ -109,9 +109,7 @@ const BlacklistAdvanced = ({
const validationSchema = Yup.object().shape({
label: Yup.string().required('A label is required!'),
- content: Yup.string()
- .required('The message content is required!')
- .trim()
+ content: Yup.string().required('The message content is required!').trim()
})
return (
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
rename to new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
index 5e9eb95a..f84ea1cc 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
@@ -3,13 +3,13 @@ import { makeStyles } from '@material-ui/core/styles'
import { Formik, Form, Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
+import { H3 } from 'src/components/typography'
+import * as Yup from 'yup'
+
import { Link } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs/formik'
-import { H3 } from 'src/components/typography'
import styles from './Blacklist.styles'
const useStyles = makeStyles(styles)
@@ -36,9 +36,7 @@ const BlackListModal = ({ onClose, addToBlacklist, errorMsg }) => {
address: ''
}}
validationSchema={Yup.object({
- address: Yup.string()
- .trim()
- .required('An address is required')
+ address: Yup.string().trim().required('An address is required')
})}
onSubmit={({ address }) => {
handleAddToBlacklist(address.trim())
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Blacklist/BlacklistTable.js
rename to new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx
index 9e929a0c..df1b64f8 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.js
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx
@@ -1,12 +1,12 @@
import { makeStyles } from '@material-ui/core/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { DeleteDialog } from 'src/components/DeleteDialog'
-import { IconButton } from 'src/components/buttons'
import DataTable from 'src/components/tables/DataTable'
import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+
+import { IconButton } from 'src/components/buttons'
import styles from './Blacklist.styles'
diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.js b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Cashout/Cashout.js
rename to new-lamassu-admin/src/pages/Cashout/Cashout.jsx
index a07fc000..0353b220 100644
--- a/new-lamassu-admin/src/pages/Cashout/Cashout.js
+++ b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx
@@ -3,14 +3,14 @@ import { makeStyles } from '@material-ui/core/styles'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { HelpTooltip } from 'src/components/Tooltip'
+import TitleSection from 'src/components/layout/TitleSection'
+import { P, Label2 } from 'src/components/typography'
+
import { SupportLinkButton } from 'src/components/buttons'
import { NamespacedTable as EditableTable } from 'src/components/editableTable'
import { Switch } from 'src/components/inputs'
-import TitleSection from 'src/components/layout/TitleSection'
import { EmptyTable } from 'src/components/table'
-import { P, Label2 } from 'src/components/typography'
import { fromNamespace, toNamespace } from 'src/utils/config'
import Wizard from './Wizard'
diff --git a/new-lamassu-admin/src/pages/Cashout/Wizard.js b/new-lamassu-admin/src/pages/Cashout/Wizard.jsx
similarity index 81%
rename from new-lamassu-admin/src/pages/Cashout/Wizard.js
rename to new-lamassu-admin/src/pages/Cashout/Wizard.jsx
index c6cac4c1..aba07f1f 100644
--- a/new-lamassu-admin/src/pages/Cashout/Wizard.js
+++ b/new-lamassu-admin/src/pages/Cashout/Wizard.jsx
@@ -1,8 +1,8 @@
import * as R from 'ramda'
import React, { useState } from 'react'
+import Modal from 'src/components/Modal'
import * as Yup from 'yup'
-import Modal from 'src/components/Modal'
import { Autocomplete } from 'src/components/inputs/formik'
import denominations from 'src/utils/bill-denominations'
import { getBillOptions } from 'src/utils/bill-options'
@@ -83,63 +83,43 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
cassette1:
machine.numberOfCassettes >= 1 && step >= 1
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
cassette2:
machine.numberOfCassettes >= 2 && step >= 2
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
cassette3:
machine.numberOfCassettes >= 3 && step >= 3
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
cassette4:
machine.numberOfCassettes >= 4 && step >= 4
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
recycler1:
machine.numberOfRecyclers >= 1 && step >= machine.numberOfCassettes + 1
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
recycler2:
machine.numberOfRecyclers >= 2 && step >= machine.numberOfCassettes + 2
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
recycler3:
machine.numberOfRecyclers >= 3 && step >= machine.numberOfCassettes + 3
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
recycler4:
machine.numberOfRecyclers >= 4 && step >= machine.numberOfCassettes + 4
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
recycler5:
machine.numberOfRecyclers >= 5 && step >= machine.numberOfCassettes + 5
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable(),
+ : Yup.number().transform(transformNumber).nullable(),
recycler6:
machine.numberOfRecyclers >= 6 && step >= machine.numberOfCassettes + 6
? Yup.number().required()
- : Yup.number()
- .transform(transformNumber)
- .nullable()
+ : Yup.number().transform(transformNumber).nullable()
})
return (
diff --git a/new-lamassu-admin/src/pages/Cashout/WizardSplash.js b/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Cashout/WizardSplash.js
rename to new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx
index f81adf7f..0360ce66 100644
--- a/new-lamassu-admin/src/pages/Cashout/WizardSplash.js
+++ b/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
+import { H1, P, Info2 } from 'src/components/typography'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
import { Button } from 'src/components/buttons'
-import { H1, P, Info2 } from 'src/components/typography'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { neon, spacer } from 'src/styling/variables'
const styles = {
diff --git a/new-lamassu-admin/src/pages/Cashout/WizardStep.js b/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Cashout/WizardStep.js
rename to new-lamassu-admin/src/pages/Cashout/WizardStep.jsx
index 99763614..b654e479 100644
--- a/new-lamassu-admin/src/pages/Cashout/WizardStep.js
+++ b/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx
@@ -1,12 +1,13 @@
import { makeStyles } from '@material-ui/core'
import { Formik, Form, Field } from 'formik'
import React from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Stepper from 'src/components/Stepper'
+import { Info2, H4, P, Info1, Label1 } from 'src/components/typography'
+import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
+
import { Button } from 'src/components/buttons'
import { NumberInput } from 'src/components/inputs/formik'
-import { Info2, H4, P, Info1, Label1 } from 'src/components/typography'
import cassetteOne from 'src/styling/icons/cassettes/cashout-cassette-1.svg'
import cassetteTwo from 'src/styling/icons/cassettes/cashout-cassette-2.svg'
import tejo3CassetteOne from 'src/styling/icons/cassettes/tejo/3-cassettes/3-cassettes-open-1-left.svg'
@@ -16,7 +17,6 @@ import tejo4CassetteOne from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cas
import tejo4CassetteTwo from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cassettes-open-2-left.svg'
import tejo4CassetteThree from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cassettes-open-3-left.svg'
import tejo4CassetteFour from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cassettes-open-4-left.svg'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
import styles from './WizardStep.styles'
const useStyles = makeStyles(styles)
diff --git a/new-lamassu-admin/src/pages/Commissions/Commissions.js b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx
similarity index 93%
rename from new-lamassu-admin/src/pages/Commissions/Commissions.js
rename to new-lamassu-admin/src/pages/Commissions/Commissions.jsx
index 1934a723..1bd9f753 100644
--- a/new-lamassu-admin/src/pages/Commissions/Commissions.js
+++ b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx
@@ -3,13 +3,13 @@ import { makeStyles } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { HelpTooltip } from 'src/components/Tooltip'
-import { SupportLinkButton } from 'src/components/buttons'
import TitleSection from 'src/components/layout/TitleSection'
-import { ReactComponent as ReverseListingViewIcon } from 'src/styling/icons/circle buttons/listing-view/white.svg'
-import { ReactComponent as ListingViewIcon } from 'src/styling/icons/circle buttons/listing-view/zodiac.svg'
-import { ReactComponent as OverrideLabelIcon } from 'src/styling/icons/status/spring2.svg'
+import ReverseListingViewIcon from 'src/styling/icons/circle buttons/listing-view/white.svg?react'
+import ListingViewIcon from 'src/styling/icons/circle buttons/listing-view/zodiac.svg?react'
+import OverrideLabelIcon from 'src/styling/icons/status/spring2.svg?react'
+
+import { SupportLinkButton } from 'src/components/buttons'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { P } from '../../components/typography'
diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.js
rename to new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.jsx
index 40aa7a00..e96c03c3 100644
--- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.js
+++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.jsx
@@ -1,7 +1,5 @@
import * as R from 'ramda'
import React, { useState, memo } from 'react'
-
-import { Table as EditableTable } from 'src/components/editableTable'
import Section from 'src/components/layout/Section'
import {
mainFields,
@@ -13,6 +11,8 @@ import {
getOrder
} from 'src/pages/Commissions/helper'
+import { Table as EditableTable } from 'src/components/editableTable'
+
const CommissionsDetails = memo(
({ config, locale, currency, data, error, save, saveOverrides }) => {
const [isEditingDefault, setEditingDefault] = useState(false)
diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
rename to new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx
index ebf4f82e..7a1d77b8 100644
--- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
+++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx
@@ -1,9 +1,6 @@
import { makeStyles } from '@material-ui/core'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
-
-import { Table as EditableTable } from 'src/components/editableTable'
-import { Select } from 'src/components/inputs'
import {
overridesDefaults,
getCommissions,
@@ -11,6 +8,9 @@ import {
commissionsList
} from 'src/pages/Commissions/helper'
+import { Table as EditableTable } from 'src/components/editableTable'
+import { Select } from 'src/components/inputs'
+
const styles = {
headerLine: {
display: 'flex',
diff --git a/new-lamassu-admin/src/pages/Commissions/helper.js b/new-lamassu-admin/src/pages/Commissions/helper.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Commissions/helper.js
rename to new-lamassu-admin/src/pages/Commissions/helper.jsx
index 5447d2c7..c4944095 100644
--- a/new-lamassu-admin/src/pages/Commissions/helper.js
+++ b/new-lamassu-admin/src/pages/Commissions/helper.jsx
@@ -1,13 +1,12 @@
-import * as _ from 'lodash/fp'
import * as R from 'ramda'
import React from 'react'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
import { v4 } from 'uuid'
import * as Yup from 'yup'
import { Autocomplete, NumberInput } from 'src/components/inputs/formik'
import { bold } from 'src/styling/helpers'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { primaryColor, secondaryColorDark } from 'src/styling/variables'
import denominations from 'src/utils/bill-denominations'
import { getBillOptions } from 'src/utils/bill-options'
@@ -326,10 +325,7 @@ const getOverridesSchema = (values, rawData, locale) => {
const highestBill = R.isEmpty(bills) ? CURRENCY_MAX : Math.max(...bills)
return Yup.object().shape({
- machine: Yup.string()
- .nullable()
- .label('Machine')
- .required(),
+ machine: Yup.string().nullable().label('Machine').required(),
cryptoCurrencies: Yup.array()
.test({
test() {
@@ -442,7 +438,7 @@ const getCommissions = (cryptoCode, deviceId, config) => {
}
const specificOverride = R.find(
- it => it.machine === deviceId && _.includes(cryptoCode)(it.cryptoCurrencies)
+ it => it.machine === deviceId && R.includes(cryptoCode)(it.cryptoCurrencies)
)(overrides)
if (specificOverride !== undefined)
@@ -450,7 +446,7 @@ const getCommissions = (cryptoCode, deviceId, config) => {
const machineOverride = R.find(
it =>
- it.machine === deviceId && _.includes('ALL_COINS')(it.cryptoCurrencies)
+ it.machine === deviceId && R.includes('ALL_COINS')(it.cryptoCurrencies)
)(overrides)
if (machineOverride !== undefined)
@@ -459,7 +455,7 @@ const getCommissions = (cryptoCode, deviceId, config) => {
const coinOverride = R.find(
it =>
it.machine === 'ALL_MACHINES' &&
- _.includes(cryptoCode)(it.cryptoCurrencies)
+ R.includes(cryptoCode)(it.cryptoCurrencies)
)(overrides)
if (coinOverride !== undefined)
@@ -475,13 +471,8 @@ const getListCommissionsSchema = locale => {
const highestBill = R.isEmpty(bills) ? CURRENCY_MAX : Math.max(...bills)
return Yup.object().shape({
- machine: Yup.string()
- .label('Machine')
- .required(),
- cryptoCurrencies: Yup.array()
- .label('Crypto currency')
- .required()
- .min(1),
+ machine: Yup.string().label('Machine').required(),
+ cryptoCurrencies: Yup.array().label('Crypto currency').required().min(1),
cashIn: Yup.number()
.label('Cash-in')
.min(percentMin)
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.js b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx
similarity index 85%
rename from new-lamassu-admin/src/pages/Customers/CustomerData.js
rename to new-lamassu-admin/src/pages/Customers/CustomerData.jsx
index efb142b9..3213a544 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerData.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx
@@ -2,28 +2,27 @@ import Grid from '@material-ui/core/Grid'
import { makeStyles } from '@material-ui/core/styles'
import * as R from 'ramda'
import { useState, React } from 'react'
+import ImagePopper from 'src/components/ImagePopper'
+import { H3, Info3 } from 'src/components/typography'
+import CardIcon from 'src/styling/icons/ID/card/comet.svg?react'
+import PhoneIcon from 'src/styling/icons/ID/phone/comet.svg?react'
+import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/comet.svg?react'
+import CustomerListViewReversedIcon from 'src/styling/icons/circle buttons/customer-list-view/white.svg?react'
+import CustomerListViewIcon from 'src/styling/icons/circle buttons/customer-list-view/zodiac.svg?react'
+import OverviewReversedIcon from 'src/styling/icons/circle buttons/overview/white.svg?react'
+import OverviewIcon from 'src/styling/icons/circle buttons/overview/zodiac.svg?react'
import * as Yup from 'yup'
-import ImagePopper from 'src/components/ImagePopper'
import { FeatureButton } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs/formik'
-import { H3, Info3 } from 'src/components/typography'
import {
OVERRIDE_AUTHORIZED,
OVERRIDE_REJECTED
} from 'src/pages/Customers/components/propertyCard'
-import { ReactComponent as CardIcon } from 'src/styling/icons/ID/card/comet.svg'
-import { ReactComponent as PhoneIcon } from 'src/styling/icons/ID/phone/comet.svg'
-import { ReactComponent as CrossedCameraIcon } from 'src/styling/icons/ID/photo/crossed-camera.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/comet.svg'
-import { ReactComponent as CustomerListViewReversedIcon } from 'src/styling/icons/circle buttons/customer-list-view/white.svg'
-import { ReactComponent as CustomerListViewIcon } from 'src/styling/icons/circle buttons/customer-list-view/zodiac.svg'
-import { ReactComponent as OverviewReversedIcon } from 'src/styling/icons/circle buttons/overview/white.svg'
-import { ReactComponent as OverviewIcon } from 'src/styling/icons/circle buttons/overview/zodiac.svg'
-import { URI } from 'src/utils/apollo'
import { onlyFirstToUpper } from 'src/utils/string'
-import styles from './CustomerData.styles.js'
+import styles from './CustomerData.styles'
import { EditableCard } from './components'
import {
customerDataElements,
@@ -31,7 +30,7 @@ import {
formatDates,
tryFormatDate,
getFormattedPhone
-} from './helper.js'
+} from './helper'
const useStyles = makeStyles(styles)
@@ -90,8 +89,8 @@ const CustomerData = ({
const sanctionsDisplay = !sanctionsAt
? 'Not checked yet'
: sanctions
- ? 'Passed'
- : 'Failed'
+ ? 'Passed'
+ : 'Failed'
const sortByName = R.sortBy(
R.compose(R.toLower, R.path(['customInfoRequest', 'customRequest', 'name']))
@@ -264,9 +263,7 @@ const CustomerData = ({
src={
!R.isNil(previewPhoto)
? URL.createObjectURL(previewPhoto)
- : `${URI}/front-camera-photo/${R.path(['frontCameraPath'])(
- customer
- )}`
+ : `/front-camera-photo/${R.path(['frontCameraPath'])(customer)}`
}
/>
) : null
@@ -305,9 +302,7 @@ const CustomerData = ({
src={
!R.isNil(previewCard)
? URL.createObjectURL(previewCard)
- : `${URI}/id-card-photo/${R.path(['idCardPhotoPath'])(
- customer
- )}`
+ : `/id-card-photo/${R.path(['idCardPhotoPath'])(customer)}`
}
/>
) : null
@@ -387,44 +382,50 @@ const CustomerData = ({
})
}, customInfoRequests)
- R.forEach(it => {
- customFields.push({
- fields: [
- {
- name: it.label,
- label: it.label,
- value: it.value ?? '',
- component: TextInput,
- editable: true
+ R.forEach(
+ it => {
+ customFields.push({
+ fields: [
+ {
+ name: it.label,
+ label: it.label,
+ value: it.value ?? '',
+ component: TextInput,
+ editable: true
+ }
+ ],
+ title: it.label,
+ titleIcon:
-
-
-
-
-
- {'Customer data'}
- {// TODO: Remove false condition for next release - false && ( - <> -
{!listView && customer && (
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerNotes.js b/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx
similarity index 87%
rename from new-lamassu-admin/src/pages/Customers/CustomerNotes.js
rename to new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx
index b7f055ba..dd05d1e6 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerNotes.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx
@@ -1,7 +1,6 @@
import { makeStyles } from '@material-ui/core'
import * as R from 'ramda'
import { React, useState } from 'react'
-
import { H3 } from 'src/components/typography'
import styles from './CustomerNotes.styles'
@@ -59,17 +58,15 @@ const CustomerNotes = ({
{R.isNil(editing) && (
{photosData.map((elem, idx) => (
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx
similarity index 60%
rename from new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js
rename to new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx
index a698a218..e4e90871 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx
@@ -1,17 +1,16 @@
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React from 'react'
+import CustomerDataReversedIcon from 'src/styling/icons/customer-nav/data/comet.svg?react'
+import CustomerDataIcon from 'src/styling/icons/customer-nav/data/white.svg?react'
+import NoteReversedIcon from 'src/styling/icons/customer-nav/note/comet.svg?react'
+import NoteIcon from 'src/styling/icons/customer-nav/note/white.svg?react'
+import OverviewReversedIcon from 'src/styling/icons/customer-nav/overview/comet.svg?react'
+import OverviewIcon from 'src/styling/icons/customer-nav/overview/white.svg?react'
+import PhotosReversedIcon from 'src/styling/icons/customer-nav/photos/comet.svg?react'
+import Photos from 'src/styling/icons/customer-nav/photos/white.svg?react'
-import { ReactComponent as CustomerDataReversedIcon } from 'src/styling/icons/customer-nav/data/comet.svg'
-import { ReactComponent as CustomerDataIcon } from 'src/styling/icons/customer-nav/data/white.svg'
-import { ReactComponent as NoteReversedIcon } from 'src/styling/icons/customer-nav/note/comet.svg'
-import { ReactComponent as NoteIcon } from 'src/styling/icons/customer-nav/note/white.svg'
-import { ReactComponent as OverviewReversedIcon } from 'src/styling/icons/customer-nav/overview/comet.svg'
-import { ReactComponent as OverviewIcon } from 'src/styling/icons/customer-nav/overview/white.svg'
-import { ReactComponent as PhotosReversedIcon } from 'src/styling/icons/customer-nav/photos/comet.svg'
-import { ReactComponent as Photos } from 'src/styling/icons/customer-nav/photos/white.svg'
-
-import styles from './CustomerSidebar.styles.js'
+import styles from './CustomerSidebar.styles'
const useStyles = makeStyles(styles)
@@ -46,8 +45,9 @@ const CustomerSidebar = ({ isSelected, onClick }) => {
return (
diff --git a/new-lamassu-admin/src/pages/Customers/Customers.js b/new-lamassu-admin/src/pages/Customers/Customers.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Customers/Customers.js
rename to new-lamassu-admin/src/pages/Customers/Customers.jsx
index 8a674f4a..69cba4cc 100644
--- a/new-lamassu-admin/src/pages/Customers/Customers.js
+++ b/new-lamassu-admin/src/pages/Customers/Customers.jsx
@@ -4,14 +4,14 @@ import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
import { useHistory } from 'react-router-dom'
-
import SearchBox from 'src/components/SearchBox'
import SearchFilter from 'src/components/SearchFilter'
-import { Link } from 'src/components/buttons'
import TitleSection from 'src/components/layout/TitleSection'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+
+import { Link } from 'src/components/buttons'
import baseStyles from 'src/pages/Logs.styles'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { fromNamespace, namespaces } from 'src/utils/config'
import CustomersList from './CustomersList'
@@ -120,9 +120,8 @@ const Customers = () => {
onCompleted: data => setFilteredCustomers(R.path(['customers'])(data))
})
- const { data: filtersResponse, loading: loadingFilters } = useQuery(
- GET_CUSTOMER_FILTERS
- )
+ const { data: filtersResponse, loading: loadingFilters } =
+ useQuery(GET_CUSTOMER_FILTERS)
const [createNewCustomer] = useMutation(CREATE_CUSTOMER, {
onCompleted: () => setShowCreationModal(false),
diff --git a/new-lamassu-admin/src/pages/Customers/CustomersList.js b/new-lamassu-admin/src/pages/Customers/CustomersList.jsx
similarity index 92%
rename from new-lamassu-admin/src/pages/Customers/CustomersList.js
rename to new-lamassu-admin/src/pages/Customers/CustomersList.jsx
index df39f4d9..a34303a6 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomersList.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomersList.jsx
@@ -2,11 +2,10 @@ import { makeStyles } from '@material-ui/core/styles'
import { format } from 'date-fns/fp'
import * as R from 'ramda'
import React from 'react'
-
import { MainStatus } from 'src/components/Status'
import DataTable from 'src/components/tables/DataTable'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
import styles from './CustomersList.styles'
import { getFormattedPhone, getName } from './helper'
diff --git a/new-lamassu-admin/src/pages/Customers/Wizard.js b/new-lamassu-admin/src/pages/Customers/Wizard.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Customers/Wizard.js
rename to new-lamassu-admin/src/pages/Customers/Wizard.jsx
index 6f81b9de..39924da6 100644
--- a/new-lamassu-admin/src/pages/Customers/Wizard.js
+++ b/new-lamassu-admin/src/pages/Customers/Wizard.jsx
@@ -2,10 +2,10 @@ import { makeStyles } from '@material-ui/core'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useState, Fragment } from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
import Stepper from 'src/components/Stepper'
+
import { Button } from 'src/components/buttons'
import { comet } from 'src/styling/variables'
diff --git a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.js b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
similarity index 82%
rename from new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.js
rename to new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
index 984d9d64..2f13948c 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.js
+++ b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
@@ -1,15 +1,15 @@
import { makeStyles } from '@material-ui/core/styles'
import { Field, Form, Formik } from 'formik'
-import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber'
+import { parsePhoneNumberWithError } from 'libphonenumber-js'
import * as R from 'ramda'
import React from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
+import { H1 } from 'src/components/typography'
+import * as Yup from 'yup'
+
import { Button } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs/formik'
-import { H1 } from 'src/components/typography'
import { spacer, primaryColor, fontPrimary } from 'src/styling/variables'
const styles = {
@@ -33,37 +33,27 @@ const styles = {
}
}
-const pnUtilInstance = PhoneNumberUtil.getInstance()
-
const getValidationSchema = countryCodes =>
Yup.object().shape({
phoneNumber: Yup.string()
.required('A phone number is required')
.test('is-valid-number', 'That is not a valid phone number', value => {
try {
- const validMap = R.map(it => {
- const number = pnUtilInstance.parseAndKeepRawInput(value, it)
- return pnUtilInstance.isValidNumber(number)
- }, countryCodes)
-
- return R.any(it => it === true, validMap)
- } catch (e) {}
+ return countryCodes.some(countryCode => parsePhoneNumberWithError(value, countryCode).isValid())
+ } catch (e) {
+ return false
+ }
})
.trim()
})
const formatPhoneNumber = (countryCodes, numberStr) => {
const matchedCountry = R.find(it => {
- const number = pnUtilInstance.parseAndKeepRawInput(numberStr, it)
- return pnUtilInstance.isValidNumber(number)
+ const number = parsePhoneNumberWithError(numberStr, it)
+ return number.isValid()
}, countryCodes)
- const matchedNumber = pnUtilInstance.parseAndKeepRawInput(
- numberStr,
- matchedCountry
- )
-
- return pnUtilInstance.format(matchedNumber, PhoneNumberFormat.E164)
+ return parsePhoneNumberWithError(numberStr, matchedCountry).number
}
const initialValues = {
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.js b/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.js
rename to new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx
index 635b1c78..e57064aa 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.js
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx
@@ -3,10 +3,8 @@ import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import gql from 'graphql-tag'
import React, { useState } from 'react'
-
import Modal from 'src/components/Modal'
import { MainStatus } from 'src/components/Status'
-import { ActionButton } from 'src/components/buttons'
import {
Table,
THead,
@@ -16,11 +14,13 @@ import {
TBody
} from 'src/components/fake-table/Table'
import { H3, Label1 } from 'src/components/typography'
-import { ReactComponent as AuthorizeReversedIcon } from 'src/styling/icons/button/authorize/white.svg'
-import { ReactComponent as AuthorizeIcon } from 'src/styling/icons/button/authorize/zodiac.svg'
-import { ReactComponent as RejectReversedIcon } from 'src/styling/icons/button/cancel/white.svg'
-import { ReactComponent as RejectIcon } from 'src/styling/icons/button/cancel/zodiac.svg'
-import { ReactComponent as LinkIcon } from 'src/styling/icons/month arrows/right.svg'
+import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react'
+import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react'
+import RejectReversedIcon from 'src/styling/icons/button/cancel/white.svg?react'
+import RejectIcon from 'src/styling/icons/button/cancel/zodiac.svg?react'
+import LinkIcon from 'src/styling/icons/month arrows/right.svg?react'
+
+import { ActionButton } from 'src/components/buttons'
import { white, disabledColor } from 'src/styling/variables'
import DetailsCard from '../../Triggers/CustomInfoRequests/DetailsCard'
@@ -134,8 +134,8 @@ const CustomInfoRequestsData = ({ data }) => {
it.approved === null
? { label: 'Pending', type: 'neutral' }
: it.approved === false
- ? { label: 'Rejected', type: 'error' }
- : { label: 'Accepted', type: 'success' }
+ ? { label: 'Rejected', type: 'error' }
+ : { label: 'Accepted', type: 'success' }
return (
<>
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.js b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
similarity index 93%
rename from new-lamassu-admin/src/pages/Customers/components/CustomerDetails.js
rename to new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
index 738ebd3b..f400e073 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.js
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
@@ -1,9 +1,8 @@
import { makeStyles, Box } from '@material-ui/core'
import * as R from 'ramda'
import React, { memo } from 'react'
-
import { H2, Label1, P } from 'src/components/typography'
-import { ReactComponent as IdIcon } from 'src/styling/icons/ID/card/zodiac.svg'
+import IdIcon from 'src/styling/icons/ID/card/zodiac.svg?react'
import mainStyles from '../CustomersList.styles'
import { getFormattedPhone, getName } from '../helper'
@@ -60,8 +59,8 @@ const CustomerDetails = memo(({ customer, photosData, locale, timezone }) => {
{name.length
? name
: email?.length
- ? email
- : getFormattedPhone(phone, locale.country)}
+ ? email
+ : getFormattedPhone(phone, locale.country)}
- {sideBarOptions?.map(({ Icon, InverseIcon, display, code }) => (
+ {sideBarOptions?.map(({ Icon, InverseIcon, display, code }, idx) => (
@@ -259,16 +259,16 @@ const EditableCard = ({
{!editing && (
- {false && (
- deleteEditedData()}>
- Delete
-
- )}
+ {/*{false && (*/}
+ {/* deleteEditedData()}>*/}
+ {/* Delete*/}
+ {/* */}
+ {/*)}*/}
{!hasAdditionalData && (
{
{frontCameraPath ? (
) : (
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
similarity index 82%
rename from new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js
rename to new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
index 802f3adf..44ac023f 100644
--- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
@@ -1,14 +1,13 @@
import { makeStyles, Box } from '@material-ui/core'
import * as R from 'ramda'
import React, { memo } from 'react'
+import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react'
import {
PropertyCard,
OVERRIDE_AUTHORIZED,
OVERRIDE_REJECTED
} from 'src/pages/Customers/components/propertyCard'
-import { ReactComponent as CrossedCameraIcon } from 'src/styling/icons/ID/photo/crossed-camera.svg'
-import { URI } from 'src/utils/apollo'
const useStyles = makeStyles({
idCardPhotoCard: {
@@ -39,9 +38,7 @@ const IdCardPhotoCard = memo(({ customerData, updateCustomer }) => {
{customerData.idCardPhotoPath ? (
()
) : (
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Customers/components/IdDataCard.js
rename to new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx
diff --git a/new-lamassu-admin/src/pages/Customers/components/PhoneCard.js b/new-lamassu-admin/src/pages/Customers/components/PhoneCard.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Customers/components/PhoneCard.js
rename to new-lamassu-admin/src/pages/Customers/components/PhoneCard.jsx
diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.js b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Customers/components/PhotosCard.js
rename to new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx
index d3c56133..0c88d50d 100644
--- a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx
@@ -3,11 +3,9 @@ import Paper from '@material-ui/core/Card'
import { makeStyles } from '@material-ui/core/styles'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
-
import { InformativeDialog } from 'src/components/InformativeDialog'
import { Info2 } from 'src/components/typography'
-import { ReactComponent as CrossedCameraIcon } from 'src/styling/icons/ID/photo/crossed-camera.svg'
-import { URI } from 'src/utils/apollo'
+import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react'
import styles from './PhotosCard.styles'
import PhotosCarousel from './PhotosCarousel'
@@ -39,7 +37,7 @@ const PhotosCard = memo(({ photosData, timezone }) => {
diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.js b/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.js
rename to new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx
index cfc3901f..da4771c7 100644
--- a/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.js
+++ b/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core/styles'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
-
import { Carousel } from 'src/components/Carousel'
import { Label1 } from 'src/components/typography'
+
import { formatDate } from 'src/utils/timezones'
import CopyToClipboard from '../../Transactions/CopyToClipboard'
diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
similarity index 92%
rename from new-lamassu-admin/src/pages/Customers/components/TransactionsList.js
rename to new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
index 513ab311..cd592d0d 100644
--- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js
+++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
@@ -1,14 +1,14 @@
-import { utils as coinUtils } from '@lamassu/coins'
+import { toUnit } from '@lamassu/coins/lightUtils'
import { makeStyles, Box } from '@material-ui/core'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
import * as R from 'ramda'
import React from 'react'
-
import DataTable from 'src/components/tables/DataTable'
import { H3, H4, Label1, Label2, P } from 'src/components/typography'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+
import { ifNotNull } from 'src/utils/nullCheck'
import { formatDate } from 'src/utils/timezones'
@@ -116,9 +116,9 @@ const TransactionsList = ({ customer, data, loading }) => {
textAlign: 'right',
view: it => (
<>
- {`${coinUtils
- .toUnit(new BigNumber(it.cryptoAtoms), it.cryptoCode)
- .toFormat(5)} `}
+ {`${toUnit(new BigNumber(it.cryptoAtoms), it.cryptoCode).toFormat(
+ 5
+ )} `}
{it.cryptoCode}
)
diff --git a/new-lamassu-admin/src/pages/Customers/components/Upload.js b/new-lamassu-admin/src/pages/Customers/components/Upload.jsx
similarity index 92%
rename from new-lamassu-admin/src/pages/Customers/components/Upload.js
rename to new-lamassu-admin/src/pages/Customers/components/Upload.jsx
index 2b8f8896..17bce94f 100644
--- a/new-lamassu-admin/src/pages/Customers/components/Upload.js
+++ b/new-lamassu-admin/src/pages/Customers/components/Upload.jsx
@@ -3,10 +3,10 @@ import { useFormikContext } from 'formik'
import * as R from 'ramda'
import React, { useState, useCallback } from 'react'
import { useDropzone } from 'react-dropzone'
-
import { Label3, H3 } from 'src/components/typography'
-import { ReactComponent as UploadPhotoIcon } from 'src/styling/icons/button/photo/zodiac-resized.svg'
-import { ReactComponent as UploadFileIcon } from 'src/styling/icons/button/upload-file/zodiac-resized.svg'
+import UploadPhotoIcon from 'src/styling/icons/button/photo/zodiac-resized.svg?react'
+import UploadFileIcon from 'src/styling/icons/button/upload-file/zodiac-resized.svg?react'
+
import { offColor, subheaderColor } from 'src/styling/variables'
const useStyles = makeStyles({
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.js b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
similarity index 87%
rename from new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.js
rename to new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
index 72a1e2b9..65388602 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
@@ -1,9 +1,8 @@
import { makeStyles, Paper } from '@material-ui/core'
import classNames from 'classnames'
import { React } from 'react'
-
import { P } from 'src/components/typography'
-import { ReactComponent as AddIcon } from 'src/styling/icons/button/add/zodiac.svg'
+import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react'
import styles from './NoteCard.styles'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.js b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.js
rename to new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx
index eb832607..5e36507e 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.js
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx
@@ -1,10 +1,10 @@
import { makeStyles } from '@material-ui/core/styles'
import { Form, Formik, Field } from 'formik'
import { React } from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
+import * as Yup from 'yup'
+
import { Button } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs/formik'
@@ -18,10 +18,7 @@ const initialValues = {
}
const validationSchema = Yup.object().shape({
- title: Yup.string()
- .required()
- .trim()
- .max(25),
+ title: Yup.string().required().trim().max(25),
content: Yup.string().required()
})
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.js b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
similarity index 94%
rename from new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.js
rename to new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
index 68f779d6..3ce56ce3 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
@@ -1,9 +1,9 @@
import { makeStyles, Paper } from '@material-ui/core'
import * as R from 'ramda'
import { React } from 'react'
-
import { H3, P } from 'src/components/typography'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+
import { formatDate } from 'src/utils/timezones'
import styles from './NoteCard.styles'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.js b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
similarity index 87%
rename from new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.js
rename to new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
index dcfc36a8..50da039c 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.js
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
@@ -2,15 +2,15 @@ import { makeStyles, Paper } from '@material-ui/core'
import { formatDurationWithOptions, intervalToDuration } from 'date-fns/fp'
import { Form, Formik, Field } from 'formik'
import { React, useRef } from 'react'
+import { P } from 'src/components/typography'
+import CancelIconInverse from 'src/styling/icons/button/cancel/white.svg?react'
+import CancelIcon from 'src/styling/icons/button/cancel/zodiac.svg?react'
+import SaveIconInverse from 'src/styling/icons/circle buttons/save/white.svg?react'
+import SaveIcon from 'src/styling/icons/circle buttons/save/zodiac.svg?react'
import * as Yup from 'yup'
import { ActionButton } from 'src/components/buttons'
import { TextInput } from 'src/components/inputs/formik'
-import { P } from 'src/components/typography'
-import { ReactComponent as CancelIconInverse } from 'src/styling/icons/button/cancel/white.svg'
-import { ReactComponent as CancelIcon } from 'src/styling/icons/button/cancel/zodiac.svg'
-import { ReactComponent as SaveIconInverse } from 'src/styling/icons/circle buttons/save/white.svg'
-import { ReactComponent as SaveIcon } from 'src/styling/icons/circle buttons/save/zodiac.svg'
import { toTimezone } from 'src/utils/timezones'
import styles from './NoteCard.styles'
diff --git a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.js b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
similarity index 82%
rename from new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.js
rename to new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
index a2d1df31..9db47b44 100644
--- a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
@@ -2,16 +2,16 @@ import { Paper } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
-
import { MainStatus } from 'src/components/Status'
-import { ActionButton } from 'src/components/buttons'
import { H3 } from 'src/components/typography'
-import { ReactComponent as AuthorizeReversedIcon } from 'src/styling/icons/button/authorize/white.svg'
-import { ReactComponent as AuthorizeIcon } from 'src/styling/icons/button/authorize/zodiac.svg'
-import { ReactComponent as RejectReversedIcon } from 'src/styling/icons/button/cancel/white.svg'
-import { ReactComponent as RejectIcon } from 'src/styling/icons/button/cancel/zodiac.svg'
-import { ReactComponent as EditReversedIcon } from 'src/styling/icons/button/edit/white.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/button/edit/zodiac.svg'
+import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react'
+import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react'
+import RejectReversedIcon from 'src/styling/icons/button/cancel/white.svg?react'
+import RejectIcon from 'src/styling/icons/button/cancel/zodiac.svg?react'
+import EditReversedIcon from 'src/styling/icons/button/edit/white.svg?react'
+import EditIcon from 'src/styling/icons/button/edit/zodiac.svg?react'
+
+import { ActionButton } from 'src/components/buttons'
import { propertyCardStyles } from './PropertyCard.styles'
@@ -93,8 +93,8 @@ const PropertyCard = memo(
state === OVERRIDE_PENDING
? { label: 'Pending', type: 'neutral' }
: state === OVERRIDE_REJECTED
- ? { label: 'Rejected', type: 'error' }
- : { label: 'Accepted', type: 'success' }
+ ? { label: 'Rejected', type: 'error' }
+ : { label: 'Accepted', type: 'success' }
return (
{
const getName = it => {
const idData = R.path(['idCardData'])(it)
- return `${R.path(['firstName'])(idData) ?? ''} ${R.path(['lastName'])(
- idData
- ) ?? ''}`.trim()
+ return `${R.path(['firstName'])(idData) ?? ''} ${
+ R.path(['lastName'])(idData) ?? ''
+ }`.trim()
}
// Manual Entry Wizard
@@ -325,8 +326,9 @@ const ManualDataEntry = ({ selectedValues, customInfoRequirementOptions }) => {
-
- ),
- R.times(R.identity, maxNumberOfCassettes)
- )}
+ {R.times(R.identity, maxNumberOfCassettes).map((it, idx) => (
+
+
+ ))}
@@ -143,21 +140,19 @@ const MachinesTable = ({ machines = [], numToRender }) => {
- {R.map(
- it =>
- machine.numberOfCassettes >= it ? (
-
- {makePercentageText(
- it,
- machine.cashUnits[`cassette${it}`]
- )}
-
- ) : (
-
- {`— %`}
-
- ),
- R.range(1, maxNumberOfCassettes + 1)
+ {R.range(1, maxNumberOfCassettes + 1).map((it, idx) =>
+ machine.numberOfCassettes >= it ? (
+
+ {makePercentageText(
+ it,
+ machine.cashUnits[`cassette${it}`]
+ )}
+
+ ) : (
+
+ {`— %`}
+
+ )
)}
)
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.js
rename to new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx
index 6d07636a..4243f22c 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx
@@ -6,7 +6,6 @@ import classnames from 'classnames'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React from 'react'
-
import { cardState as cardState_ } from 'src/components/CollapsibleCard'
// import ActionButton from 'src/components/buttons/ActionButton'
import { H4, TL2, Label1 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Funding.js b/new-lamassu-admin/src/pages/Funding.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Funding.js
rename to new-lamassu-admin/src/pages/Funding.jsx
index 9462ea1c..80f47292 100644
--- a/new-lamassu-admin/src/pages/Funding.js
+++ b/new-lamassu-admin/src/pages/Funding.jsx
@@ -1,5 +1,5 @@
import { useQuery } from '@apollo/react-hooks'
-import { utils as coinUtils } from '@lamassu/coins'
+import { formatCryptoAddress } from '@lamassu/coins/lightUtils'
import { makeStyles } from '@material-ui/core/styles'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
@@ -8,7 +8,6 @@ import gql from 'graphql-tag'
import QRCode from 'qrcode.react'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import TableLabel from 'src/components/TableLabel'
import Title from 'src/components/Title'
import { Tr, Td, THead, TBody, Table } from 'src/components/fake-table/Table'
@@ -22,6 +21,7 @@ import {
Label3
} from 'src/components/typography'
import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard'
+
import { primaryColor } from 'src/styling/variables'
import styles from './Funding.styles'
@@ -55,7 +55,7 @@ const GET_FUNDING = gql`
`
const formatAddress = (cryptoCode = '', address = '') =>
- coinUtils.formatCryptoAddress(cryptoCode, address).replace(/(.{4})/g, '$1 ')
+ formatCryptoAddress(cryptoCode, address).replace(/(.{4})/g, '$1 ')
const sumReducer = (acc, value) => acc.plus(value)
const formatNumber = it => new BigNumber(it).toFormat(2)
diff --git a/new-lamassu-admin/src/pages/Locales/Locales.js b/new-lamassu-admin/src/pages/Locales/Locales.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Locales/Locales.js
rename to new-lamassu-admin/src/pages/Locales/Locales.jsx
index 20be0836..7eb04348 100644
--- a/new-lamassu-admin/src/pages/Locales/Locales.js
+++ b/new-lamassu-admin/src/pages/Locales/Locales.jsx
@@ -3,16 +3,16 @@ import { makeStyles } from '@material-ui/core/styles'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import Modal from 'src/components/Modal'
import { HelpTooltip } from 'src/components/Tooltip'
-import { Link, SupportLinkButton } from 'src/components/buttons'
-import { Table as EditableTable } from 'src/components/editableTable'
import Section from 'src/components/layout/Section'
import TitleSection from 'src/components/layout/TitleSection'
import { P } from 'src/components/typography'
import Wizard from 'src/pages/Wallet/Wizard'
import { WalletSchema } from 'src/pages/Wallet/helper'
+
+import { Link, SupportLinkButton } from 'src/components/buttons'
+import { Table as EditableTable } from 'src/components/editableTable'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { styles } from './Locales.styles'
diff --git a/new-lamassu-admin/src/pages/Locales/helper.js b/new-lamassu-admin/src/pages/Locales/helper.js
index 2c050694..b8193c56 100644
--- a/new-lamassu-admin/src/pages/Locales/helper.js
+++ b/new-lamassu-admin/src/pages/Locales/helper.js
@@ -1,7 +1,7 @@
import * as R from 'ramda'
+import Autocomplete from 'src/components/inputs/formik/Autocomplete'
import * as Yup from 'yup'
-import Autocomplete from 'src/components/inputs/formik/Autocomplete.js'
import { labels as timezoneList } from 'src/utils/timezone-list'
const getFields = (getData, names, onChange, auxElements = []) => {
@@ -153,42 +153,18 @@ const overrides = (auxData, auxElements, configureCoin) => {
}
const LocaleSchema = Yup.object().shape({
- country: Yup.string()
- .label('Country')
- .required(),
- fiatCurrency: Yup.string()
- .label('Fiat currency')
- .required(),
- languages: Yup.array()
- .label('Languages')
- .required()
- .min(1)
- .max(4),
- cryptoCurrencies: Yup.array()
- .label('Crypto currencies')
- .required()
- .min(1),
- timezone: Yup.string()
- .label('Timezone')
- .required()
+ country: Yup.string().label('Country').required(),
+ fiatCurrency: Yup.string().label('Fiat currency').required(),
+ languages: Yup.array().label('Languages').required().min(1).max(4),
+ cryptoCurrencies: Yup.array().label('Crypto currencies').required().min(1),
+ timezone: Yup.string().label('Timezone').required()
})
const OverridesSchema = Yup.object().shape({
- machine: Yup.string()
- .label('Machine')
- .required(),
- country: Yup.string()
- .label('Country')
- .required(),
- languages: Yup.array()
- .label('Languages')
- .required()
- .min(1)
- .max(4),
- cryptoCurrencies: Yup.array()
- .label('Crypto currencies')
- .required()
- .min(1)
+ machine: Yup.string().label('Machine').required(),
+ country: Yup.string().label('Country').required(),
+ languages: Yup.array().label('Languages').required().min(1).max(4),
+ cryptoCurrencies: Yup.array().label('Crypto currencies').required().min(1)
})
const localeDefaults = {
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.js b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.js
rename to new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx
index 8ee1b689..775b54bf 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.js
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx
@@ -2,14 +2,14 @@ import { makeStyles } from '@material-ui/core/styles'
import { Form, Formik, Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
import { HelpTooltip } from 'src/components/Tooltip'
+import { H3, TL1, P } from 'src/components/typography'
+import * as Yup from 'yup'
+
import { Button } from 'src/components/buttons'
import { NumberInput, Autocomplete } from 'src/components/inputs/formik'
-import { H3, TL1, P } from 'src/components/typography'
import styles from './IndividualDiscount.styles'
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js
rename to new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
index 0146f8d5..93f76169 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
@@ -3,13 +3,13 @@ import { makeStyles, Box } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { DeleteDialog } from 'src/components/DeleteDialog'
-import { Link, Button, IconButton } from 'src/components/buttons'
import DataTable from 'src/components/tables/DataTable'
import { Label3, TL1 } from 'src/components/typography'
-import { ReactComponent as PhoneIdIcon } from 'src/styling/icons/ID/phone/zodiac.svg'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
+import PhoneIdIcon from 'src/styling/icons/ID/phone/zodiac.svg?react'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+
+import { Link, Button, IconButton } from 'src/components/buttons'
import styles from './IndividualDiscount.styles'
import IndividualDiscountModal from './IndividualDiscountModal'
@@ -65,9 +65,8 @@ const IndividualDiscounts = () => {
const { data: discountResponse, loading: discountLoading } = useQuery(
GET_INDIVIDUAL_DISCOUNTS
)
- const { data: customerData, loading: customerLoading } = useQuery(
- GET_CUSTOMERS
- )
+ const { data: customerData, loading: customerLoading } =
+ useQuery(GET_CUSTOMERS)
const [createDiscount, { error: creationError }] = useMutation(
CREATE_DISCOUNT,
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.js b/new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.js
rename to new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.jsx
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.js b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.js
rename to new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
index 5e78024c..dbe0d8f2 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.js
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
@@ -3,12 +3,12 @@ import { makeStyles, Box } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { DeleteDialog } from 'src/components/DeleteDialog'
-import { Link, Button, IconButton } from 'src/components/buttons'
import DataTable from 'src/components/tables/DataTable'
import { Label3, TL1 } from 'src/components/typography'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+
+import { Link, Button, IconButton } from 'src/components/buttons'
import styles from './PromoCodes.styles'
import PromoCodesModal from './PromoCodesModal'
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.js b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.js
rename to new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx
index 255bc547..474960b1 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.js
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx
@@ -2,14 +2,14 @@ import { makeStyles } from '@material-ui/core/styles'
import { Form, Formik, Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
import { HelpTooltip } from 'src/components/Tooltip'
+import { H3, TL1, P } from 'src/components/typography'
+import * as Yup from 'yup'
+
import { Button } from 'src/components/buttons'
import { TextInput, NumberInput } from 'src/components/inputs/formik'
-import { H3, TL1, P } from 'src/components/typography'
import styles from './PromoCodes.styles'
@@ -21,14 +21,8 @@ const initialValues = {
}
const validationSchema = Yup.object().shape({
- code: Yup.string()
- .required()
- .trim()
- .max(25),
- discount: Yup.number()
- .required()
- .min(0)
- .max(100)
+ code: Yup.string().required().trim().max(25),
+ discount: Yup.number().required().min(0).max(100)
})
const PromoCodesModal = ({ showModal, onClose, errorMsg, addCode }) => {
diff --git a/new-lamassu-admin/src/pages/MachineLogs.js b/new-lamassu-admin/src/pages/MachineLogs.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/MachineLogs.js
rename to new-lamassu-admin/src/pages/MachineLogs.jsx
index 88bc6478..bcde1a2d 100644
--- a/new-lamassu-admin/src/pages/MachineLogs.js
+++ b/new-lamassu-admin/src/pages/MachineLogs.jsx
@@ -3,10 +3,11 @@ import { makeStyles } from '@material-ui/core/styles'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
import Title from 'src/components/Title'
import Sidebar from 'src/components/layout/Sidebar'
+import { Info3, H4 } from 'src/components/typography'
+
import {
Table,
TableHead,
@@ -15,7 +16,6 @@ import {
TableBody,
TableCell
} from 'src/components/table'
-import { Info3, H4 } from 'src/components/typography'
import { formatDate } from 'src/utils/timezones'
import styles from './Logs.styles'
@@ -81,9 +81,8 @@ const Logs = () => {
const deviceId = selected?.deviceId
- const { data: machineResponse, loading: machinesLoading } = useQuery(
- GET_MACHINES
- )
+ const { data: machineResponse, loading: machinesLoading } =
+ useQuery(GET_MACHINES)
const { data: configResponse, loading: configLoading } = useQuery(GET_DATA)
const timezone = R.path(['config', 'locale_timezone'], configResponse)
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx
index eb1b45b1..3cf970c6 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx
@@ -3,11 +3,11 @@ import { makeStyles } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import DataTable from 'src/components/tables/DataTable'
import CashUnitDetails from 'src/pages/Maintenance/CashUnitDetails'
import Wizard from 'src/pages/Maintenance/Wizard/Wizard'
import helper from 'src/pages/Maintenance/helper'
+
import { fromNamespace } from 'src/utils/config'
import styles from './Cassettes.styles'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.jsx
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.jsx
index cbc47265..70065128 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.jsx
@@ -1,7 +1,6 @@
import React from 'react'
-
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
const cashInAndOutHeaderStyle = { marginLeft: 6 }
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx
index ae0e3be2..1be5ef28 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx
@@ -1,7 +1,7 @@
import { makeStyles } from '@material-ui/core/styles'
import React from 'react'
-
import { Label3, P } from 'src/components/typography'
+
import { modelPrettifier } from 'src/utils/machine'
import { formatDate } from 'src/utils/timezones'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx
index 86965037..b3fb1a7f 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx
@@ -2,11 +2,10 @@ import { makeStyles } from '@material-ui/core/styles'
import BigNumber from 'bignumber.js'
import { formatDistance } from 'date-fns'
import React from 'react'
-
import { Status } from 'src/components/Status'
import MachineActions from 'src/components/machineActions/MachineActions'
import { H3, Label1, P } from 'src/components/typography'
-import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard.js'
+import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard'
import styles from '../Machines.styles'
const useStyles = makeStyles(styles)
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
index d5636b53..615f1ca1 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
@@ -8,7 +8,6 @@ import {
CellMeasurer,
CellMeasurerCache
} from 'react-virtualized'
-
import {
Table,
TBody,
@@ -17,10 +16,11 @@ import {
Td,
Th
} from 'src/components/fake-table/Table'
-import styles from 'src/components/tables/DataTable.styles'
import { H4 } from 'src/components/typography'
-import { ReactComponent as ExpandClosedIcon } from 'src/styling/icons/action/expand/closed.svg'
-import { ReactComponent as ExpandOpenIcon } from 'src/styling/icons/action/expand/open.svg'
+import ExpandClosedIcon from 'src/styling/icons/action/expand/closed.svg?react'
+import ExpandOpenIcon from 'src/styling/icons/action/expand/open.svg?react'
+
+import styles from 'src/components/tables/DataTable.styles'
const useStyles = makeStyles(styles)
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx
similarity index 89%
rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx
index 7c13ffa6..be6b0d99 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx
@@ -1,16 +1,16 @@
import { useQuery, useLazyQuery } from '@apollo/react-hooks'
-import { utils as coinUtils } from '@lamassu/coins'
+import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
import { makeStyles } from '@material-ui/core'
import BigNumber from 'bignumber.js'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useEffect, useState } from 'react'
-
import DetailsRow from 'src/pages/Transactions/DetailsCard'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+
import { mainStyles } from 'src/pages/Transactions/Transactions.styles'
import { getStatus } from 'src/pages/Transactions/helper'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import * as Customer from 'src/utils/customer'
import { formatDate } from 'src/utils/timezones'
@@ -124,13 +124,13 @@ const Transactions = ({ id }) => {
textAlign: 'right',
size: 'sm',
view: it =>
- `${coinUtils
- .toUnit(new BigNumber(it.cryptoAtoms), it.cryptoCode)
- .toFormat(5)} ${it.cryptoCode}`
+ `${toUnit(new BigNumber(it.cryptoAtoms), it.cryptoCode).toFormat(5)} ${
+ it.cryptoCode
+ }`
},
{
header: 'Address',
- view: it => coinUtils.formatCryptoAddress(it.cryptoCode, it.toAddress),
+ view: it => formatCryptoAddress(it.cryptoCode, it.toAddress),
className: classes.overflowTd,
size: 'sm',
textAlign: 'left',
diff --git a/new-lamassu-admin/src/pages/Machines/MachineSidebar.js b/new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Machines/MachineSidebar.js
rename to new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx
diff --git a/new-lamassu-admin/src/pages/Machines/Machines.js b/new-lamassu-admin/src/pages/Machines/Machines.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Machines/Machines.js
rename to new-lamassu-admin/src/pages/Machines/Machines.jsx
index 19042f83..dae49c38 100644
--- a/new-lamassu-admin/src/pages/Machines/Machines.js
+++ b/new-lamassu-admin/src/pages/Machines/Machines.jsx
@@ -8,7 +8,6 @@ import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
import { Link, useLocation, useHistory } from 'react-router-dom'
-
import { TL1, TL2, Label3 } from 'src/components/typography'
import Cassettes from './MachineComponents/Cassettes'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js
rename to new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx
index 29c7494c..82be3f52 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx
@@ -1,10 +1,10 @@
import { makeStyles } from '@material-ui/core/styles'
import * as R from 'ramda'
import React from 'react'
-
import Chip from 'src/components/Chip'
-import { CashOut } from 'src/components/inputs'
import { Label1, TL2 } from 'src/components/typography'
+
+import { CashOut } from 'src/components/inputs'
import { offDarkColor } from 'src/styling/variables'
import { fromNamespace } from 'src/utils/config'
import { getCashUnitCapacity, modelPrettifier } from 'src/utils/machine'
@@ -106,12 +106,12 @@ const CashUnitDetails = ({
Cash box
{R.isEmpty(billCount) && Empty }
- {R.map(it => (
-
+ {R.keys(billCount).map((it, idx) => (
+
{billCount[it]}
diff --git a/new-lamassu-admin/src/pages/Maintenance/helper.js b/new-lamassu-admin/src/pages/Maintenance/helper.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Maintenance/helper.js
rename to new-lamassu-admin/src/pages/Maintenance/helper.jsx
index 6fccfd1f..acc6ef1e 100644
--- a/new-lamassu-admin/src/pages/Maintenance/helper.js
+++ b/new-lamassu-admin/src/pages/Maintenance/helper.jsx
@@ -1,8 +1,9 @@
+import React from 'react'
import * as R from 'ramda'
+import { CashIn, CashOutLite } from 'src/components/inputs/cashbox/Cashbox'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
import { IconButton } from 'src/components/buttons'
-import { CashIn, CashOutLite } from 'src/components/inputs/cashbox/Cashbox'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
import { fromNamespace } from 'src/utils/config'
import { getCashUnitCapacity } from 'src/utils/machine'
@@ -56,8 +57,9 @@ const getElements = (
return (
{!upload &&
!isCustomInfoRequirement &&
- elements.options.map(({ label, name }) => (
+ elements.options.map(({ label, name }, idx) => (
{
// first we clear old chart DOM elements on component update
- d3.select(svgRef.current)
- .selectAll('*')
- .remove()
+ d3.select(svgRef.current).selectAll('*').remove()
drawGraph()
}, [drawGraph, realData])
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js
rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.jsx
index 6148c966..3319118b 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.jsx
@@ -211,12 +211,7 @@ const Graph = ({ data, timeFrame, timezone }) => {
g
.append('g')
.selectAll('line')
- .data(
- d3
- .axisLeft(y)
- .scale()
- .ticks(5)
- )
+ .data(d3.axisLeft(y).scale().ticks(5))
.join('line')
.attr('y1', d => 0.5 + y(d))
.attr('y2', d => 0.5 + y(d))
@@ -240,10 +235,7 @@ const Graph = ({ data, timeFrame, timezone }) => {
)
// Left side breakpoint label
.call(g => {
- const separator = d3
- ?.select('.dateSeparator')
- ?.node()
- ?.getBBox()
+ const separator = d3?.select('.dateSeparator')?.node()?.getBBox()
if (!separator) return
@@ -261,10 +253,7 @@ const Graph = ({ data, timeFrame, timezone }) => {
})
// Right side breakpoint label
.call(g => {
- const separator = d3
- ?.select('.dateSeparator')
- ?.node()
- ?.getBBox()
+ const separator = d3?.select('.dateSeparator')?.node()?.getBBox()
if (!separator) return
@@ -355,9 +344,7 @@ const Graph = ({ data, timeFrame, timezone }) => {
])
useEffect(() => {
- d3.select(ref.current)
- .selectAll('*')
- .remove()
+ d3.select(ref.current).selectAll('*').remove()
drawChart()
}, [drawChart])
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.js
rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.jsx
index 0921fa3a..fef78ca2 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.jsx
@@ -1,5 +1,4 @@
import React from 'react'
-
import { Info1, Label1 } from 'src/components/typography/index'
const InfoWithLabel = ({ info, label }) => {
return (
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js
rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx
index 07f76fe4..e7054191 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx
@@ -2,7 +2,6 @@ import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { H4 } from 'src/components/typography'
import styles from './SystemPerformance.styles'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx
index 4ae6ec87..0cc8b93e 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx
@@ -7,12 +7,12 @@ import { isAfter } from 'date-fns/fp'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
+import { Label1, Label2, P } from 'src/components/typography/index'
+import PercentDownIcon from 'src/styling/icons/dashboard/down.svg?react'
+import PercentNeutralIcon from 'src/styling/icons/dashboard/equal.svg?react'
+import PercentUpIcon from 'src/styling/icons/dashboard/up.svg?react'
import { EmptyTable } from 'src/components/table'
-import { Label1, Label2, P } from 'src/components/typography/index'
-import { ReactComponent as PercentDownIcon } from 'src/styling/icons/dashboard/down.svg'
-import { ReactComponent as PercentNeutralIcon } from 'src/styling/icons/dashboard/equal.svg'
-import { ReactComponent as PercentUpIcon } from 'src/styling/icons/dashboard/up.svg'
import { java, neon } from 'src/styling/variables'
import { fromNamespace } from 'src/utils/config'
import { DAY, WEEK, MONTH } from 'src/utils/time'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx
similarity index 77%
rename from new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js
rename to new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx
index d318aabc..e478b928 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx
@@ -11,12 +11,12 @@ import gql from 'graphql-tag'
import * as R from 'ramda'
import React from 'react'
import { useHistory } from 'react-router-dom'
-
import { Status } from 'src/components/Status'
import { Label2, TL2 } from 'src/components/typography'
-// import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
-import { ReactComponent as MachineLinkIcon } from 'src/styling/icons/month arrows/right.svg'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+import MachineLinkIcon from 'src/styling/icons/month arrows/right.svg?react'
+
+// import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
import { fromNamespace } from 'src/utils/config'
import styles from './MachinesTable.styles'
@@ -107,17 +107,14 @@ const MachinesTable = ({ machines = [], numToRender }) => {
*/}
- {R.map(
- it => (
-
- {it + 1}
-
-
+ {it + 1}
+
+
{machine.numberOfRecyclers === 0 &&
@@ -149,8 +149,9 @@ const CashUnitDetails = ({
noMargin
className={classes.label}>{`Loading boxes`}
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.js b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Maintenance/CashUnits.js
rename to new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
index 73a0c47b..491cfe8e 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
@@ -3,19 +3,19 @@ import { DialogActions, makeStyles, Box } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
import Modal from 'src/components/Modal'
-import { HelpTooltip } from 'src/components/Tooltip.js'
-import { IconButton, Button, SupportLinkButton } from 'src/components/buttons'
-import { RadioGroup } from 'src/components/inputs'
+import { HelpTooltip } from 'src/components/Tooltip'
import TitleSection from 'src/components/layout/TitleSection'
-import { EmptyTable } from 'src/components/table'
import DataTable from 'src/components/tables/DataTable'
import { P, Label1 } from 'src/components/typography'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
-import { ReactComponent as ReverseHistoryIcon } from 'src/styling/icons/circle buttons/history/white.svg'
-import { ReactComponent as HistoryIcon } from 'src/styling/icons/circle buttons/history/zodiac.svg'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
+import ReverseHistoryIcon from 'src/styling/icons/circle buttons/history/white.svg?react'
+import HistoryIcon from 'src/styling/icons/circle buttons/history/zodiac.svg?react'
+
+import { IconButton, Button, SupportLinkButton } from 'src/components/buttons'
+import { RadioGroup } from 'src/components/inputs'
+import { EmptyTable } from 'src/components/table'
import { fromNamespace, toNamespace } from 'src/utils/config'
import { MANUAL, AUTOMATIC } from 'src/utils/constants'
import { onlyFirstToUpper } from 'src/utils/string'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.js b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
similarity index 93%
rename from new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.js
rename to new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
index e8696a02..1a6c0e88 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
@@ -2,14 +2,14 @@ import { makeStyles } from '@material-ui/core'
import BigNumber from 'bignumber.js'
import * as R from 'ramda'
import React from 'react'
-
import { Info1, Info2, Info3 } from 'src/components/typography/index'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
-import { fromNamespace } from 'src/utils/config'
-import { numberToFiatAmount } from 'src/utils/number.js'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
-import styles from './CashUnitsFooter.styles.js'
+import { fromNamespace } from 'src/utils/config'
+import { numberToFiatAmount } from 'src/utils/number'
+
+import styles from './CashUnitsFooter.styles'
const useStyles = makeStyles(styles)
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx
similarity index 94%
rename from new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
rename to new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx
index 86b8f4db..dff12942 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx
@@ -4,15 +4,15 @@ import gql from 'graphql-tag'
import * as R from 'ramda'
import React from 'react'
// import * as Yup from 'yup'
-
// import { Link, IconButton } from 'src/components/buttons'
// import { TextInput } from 'src/components/inputs'
-import { NumberInput } from 'src/components/inputs/formik'
import DataTable from 'src/components/tables/DataTable'
-// import { ReactComponent as EditIconDisabled } from 'src/styling/icons/action/edit/disabled.svg'
-// import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+
+import { NumberInput } from 'src/components/inputs/formik'
+// import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react'
+// import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
import { formatDate } from 'src/utils/timezones'
const GET_BATCHES = gql`
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js
rename to new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
index 5551f009..14e029d5 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
@@ -4,8 +4,9 @@ import BigNumber from 'bignumber.js'
import React from 'react'
// import { Status } from 'src/components/Status'
-// import { ReactComponent as LinkIcon } from 'src/styling/icons/button/link/zodiac.svg'
+// import LinkIcon from 'src/styling/icons/button/link/zodiac.svg?react'
import MachineActions from 'src/components/machineActions/MachineActions'
+
import { modelPrettifier } from 'src/utils/machine'
import { formatDate } from 'src/utils/timezones'
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js
index f1c64f3b..5b5222e5 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js
@@ -1,4 +1,4 @@
-import { fade } from '@material-ui/core/styles/colorManipulator'
+import { alpha } from '@material-ui/core/styles/colorManipulator'
import {
detailsRowStyles,
@@ -40,7 +40,7 @@ const machineDetailsStyles = {
zIndex: 1,
marginRight: 60,
marginLeft: 'auto',
- background: fade(comet, 0.5)
+ background: alpha(comet, 0.5)
}
}
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx
similarity index 93%
rename from new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
rename to new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx
index e50eaf5c..a8b88dab 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx
@@ -5,14 +5,14 @@ import gql from 'graphql-tag'
import * as R from 'ramda'
import React from 'react'
import { useHistory, useLocation } from 'react-router-dom'
-
import { MainStatus } from 'src/components/Status'
import Title from 'src/components/Title'
import DataTable from 'src/components/tables/DataTable'
+import MachineRedirectIcon from 'src/styling/icons/month arrows/right.svg?react'
+import WarningIcon from 'src/styling/icons/status/pumpkin.svg?react'
+import ErrorIcon from 'src/styling/icons/status/tomato.svg?react'
+
import { mainStyles } from 'src/pages/Transactions/Transactions.styles'
-import { ReactComponent as MachineRedirectIcon } from 'src/styling/icons/month arrows/right.svg'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/status/pumpkin.svg'
-import { ReactComponent as ErrorIcon } from 'src/styling/icons/status/tomato.svg'
import MachineDetailsRow from './MachineDetailsCard'
diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.js b/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.js
rename to new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.jsx
index c46f4a50..a42680e4 100644
--- a/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.js
+++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.jsx
@@ -1,8 +1,8 @@
import * as R from 'ramda'
import React, { useState } from 'react'
+import Modal from 'src/components/Modal'
import * as Yup from 'yup'
-import Modal from 'src/components/Modal'
import { MAX_NUMBER_OF_CASSETTES } from 'src/utils/constants'
import {
cashUnitCapacity,
diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js
rename to new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx
index 56fae668..549b798b 100644
--- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js
+++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx
@@ -1,10 +1,10 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
+import { H1, P, Info2 } from 'src/components/typography'
+import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
import { Button } from 'src/components/buttons'
-import { H1, P, Info2 } from 'src/components/typography'
import filledCassettes from 'src/styling/icons/cassettes/both-filled.svg'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
import { comet } from 'src/styling/variables'
const styles = {
diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js
rename to new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx
index b8468472..3b1ccab5 100644
--- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js
+++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx
@@ -3,14 +3,15 @@ import classnames from 'classnames'
import { Formik, Form, Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Stepper from 'src/components/Stepper'
import { HelpTooltip } from 'src/components/Tooltip'
-import { Button } from 'src/components/buttons'
import { Cashbox } from 'src/components/inputs/cashbox/Cashbox'
-import { NumberInput, RadioGroup } from 'src/components/inputs/formik'
import { Info2, H4, P, Info1 } from 'src/components/typography'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+
+import { Button } from 'src/components/buttons'
+import { NumberInput, RadioGroup } from 'src/components/inputs/formik'
import cashbox from 'src/styling/icons/cassettes/acceptor-left.svg'
import cassetteOne from 'src/styling/icons/cassettes/dispenser-1.svg'
import cassetteTwo from 'src/styling/icons/cassettes/dispenser-2.svg'
@@ -21,7 +22,6 @@ import tejo4CassetteOne from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cas
import tejo4CassetteTwo from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cassettes-open-2-left.svg'
import tejo4CassetteThree from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cassettes-open-3-left.svg'
import tejo4CassetteFour from 'src/styling/icons/cassettes/tejo/4-cassettes/4-cassettes-open-4-left.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { comet, errorColor } from 'src/styling/variables'
import { getCashUnitCapacity } from 'src/utils/machine'
import { numberToFiatAmount } from 'src/utils/number'
@@ -182,10 +182,8 @@ const WizardStep = ({
const numberOfCassettes = machine.numberOfCassettes
const numberOfRecyclers = machine.numberOfRecyclers
- const {
- name: cashUnitField,
- category: cashUnitCategory
- } = getCashUnitFieldName(step, numberOfCassettes, numberOfRecyclers)
+ const { name: cashUnitField, category: cashUnitCategory } =
+ getCashUnitFieldName(step, numberOfCassettes, numberOfRecyclers)
const originalCashUnitCount = machine?.cashUnits?.[cashUnitField]
const cashUnitDenomination = cashoutSettings?.[cashUnitField]
@@ -317,8 +315,8 @@ const WizardStep = ({
{cashUnitCategory === 'cassette'
? `dispenser`
: cashUnitCategory === 'recycler'
- ? `recycler`
- : ``}
+ ? `recycler`
+ : ``}
)
- {R.map(it => (
+ {R.range(1, machine.numberOfCassettes + 1).map((it, idx) => (
- {R.map(it => (
+ {R.range(1, m.numberOfCassettes + 1).map((it, idx) => (
{R.map(it => (
diff --git a/new-lamassu-admin/src/pages/Notifications/Notifications.js b/new-lamassu-admin/src/pages/Notifications/Notifications.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Notifications/Notifications.js
rename to new-lamassu-admin/src/pages/Notifications/Notifications.jsx
index 5af5f934..cc0ef1c6 100644
--- a/new-lamassu-admin/src/pages/Notifications/Notifications.js
+++ b/new-lamassu-admin/src/pages/Notifications/Notifications.jsx
@@ -2,13 +2,13 @@ import { useQuery, useMutation } from '@apollo/react-hooks'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import Modal from 'src/components/Modal'
import { HelpTooltip } from 'src/components/Tooltip'
-import { SupportLinkButton } from 'src/components/buttons'
import TitleSection from 'src/components/layout/TitleSection'
import { P } from 'src/components/typography'
import FormRenderer from 'src/pages/Services/FormRenderer'
+
+import { SupportLinkButton } from 'src/components/buttons'
import twilioSchema from 'src/pages/Services/schemas/twilio'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
similarity index 84%
rename from new-lamassu-admin/src/pages/Notifications/components/EditHeader.js
rename to new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
index f293dfbf..16aec872 100644
--- a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js
+++ b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
@@ -1,10 +1,10 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
+import { H4 } from 'src/components/typography'
+import DisabledEditIcon from 'src/styling/icons/action/edit/disabled.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
import { Link, IconButton } from 'src/components/buttons'
-import { H4 } from 'src/components/typography'
-import { ReactComponent as DisabledEditIcon } from 'src/styling/icons/action/edit/disabled.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
import styles from './EditHeader.styles'
diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.js b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Notifications/components/EditableNumber.js
rename to new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
index b04defbc..35917013 100644
--- a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.js
+++ b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
@@ -2,9 +2,9 @@ import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import { useFormikContext, Field as FormikField } from 'formik'
import React from 'react'
+import { Label1, Info1, TL2 } from 'src/components/typography'
import { NumberInput } from 'src/components/inputs/formik'
-import { Label1, Info1, TL2 } from 'src/components/typography'
import styles from './EditableNumber.styles'
diff --git a/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.js b/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.jsx
similarity index 93%
rename from new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.js
rename to new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.jsx
index 37bd9c12..78d486d1 100644
--- a/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.js
+++ b/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.jsx
@@ -1,8 +1,8 @@
import { Form, Formik } from 'formik'
import React, { useContext, useState } from 'react'
+import PromptWhenDirty from 'src/components/PromptWhenDirty'
import * as Yup from 'yup'
-import PromptWhenDirty from 'src/components/PromptWhenDirty'
import { transformNumber } from 'src/utils/number'
import NotificationsCtx from '../NotificationsContext'
@@ -33,14 +33,8 @@ const SingleFieldEditableNumber = ({
setSaving(false)
}
- const {
- save,
- data,
- currency,
- isEditing,
- isDisabled,
- setEditing
- } = useContext(NotificationsCtx)
+ const { save, data, currency, isEditing, isDisabled, setEditing } =
+ useContext(NotificationsCtx)
const schema = Yup.object().shape({
[name]: Yup.number()
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx
similarity index 92%
rename from new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js
rename to new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx
index a626020b..5a81bf34 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx
@@ -14,14 +14,8 @@ const useStyles = makeStyles(styles)
const CryptoBalanceAlerts = ({ section, fieldWidth }) => {
const classes = useStyles()
- const {
- data,
- save,
- currency,
- setEditing,
- isEditing,
- isDisabled
- } = useContext(NotificationsCtx)
+ const { data, save, currency, setEditing, isEditing, isDisabled } =
+ useContext(NotificationsCtx)
return (
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js
rename to new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.jsx
index c4957965..dd083ead 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.jsx
@@ -1,10 +1,10 @@
import * as R from 'ramda'
import React, { useContext } from 'react'
+import Autocomplete from 'src/components/inputs/formik/Autocomplete'
import * as Yup from 'yup'
import { Table as EditableTable } from 'src/components/editableTable'
import { NumberInput } from 'src/components/inputs/formik'
-import Autocomplete from 'src/components/inputs/formik/Autocomplete.js'
import { CURRENCY_MAX } from 'src/utils/constants'
import { transformNumber } from 'src/utils/number'
@@ -65,7 +65,7 @@ const CryptoBalanceOverrides = ({ section }) => {
.label('Low balance')
.when(HIGH_BALANCE_KEY, {
is: HIGH_BALANCE_KEY => !HIGH_BALANCE_KEY,
- then: Yup.number().required()
+ then: schema => schema.required()
})
.transform(transformNumber)
.integer()
@@ -76,7 +76,7 @@ const CryptoBalanceOverrides = ({ section }) => {
.label('High balance')
.when(LOW_BALANCE_KEY, {
is: LOW_BALANCE_KEY => !LOW_BALANCE_KEY,
- then: Yup.number().required()
+ then: schema => schema.required()
})
.transform(transformNumber)
.integer()
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
rename to new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx
index a4110989..b3461aab 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx
@@ -2,10 +2,10 @@ import { makeStyles } from '@material-ui/core'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useContext } from 'react'
-import * as Yup from 'yup'
-
import PromptWhenDirty from 'src/components/PromptWhenDirty'
import { TL2 } from 'src/components/typography'
+import * as Yup from 'yup'
+
import { transformNumber } from 'src/utils/number'
import { Cashbox } from '../../../components/inputs/cashbox/Cashbox'
@@ -13,7 +13,7 @@ import NotificationsCtx from '../NotificationsContext'
import Header from '../components/EditHeader'
import EditableNumber from '../components/EditableNumber'
-import styles from './FiatBalanceAlerts.styles.js'
+import styles from './FiatBalanceAlerts.styles'
const useStyles = makeStyles(styles)
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js
rename to new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.jsx
index 6769fc56..32e37865 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.jsx
@@ -1,10 +1,10 @@
import * as R from 'ramda'
import React, { useContext } from 'react'
+import Autocomplete from 'src/components/inputs/formik/Autocomplete'
import * as Yup from 'yup'
import { Table as EditableTable } from 'src/components/editableTable'
import { NumberInput } from 'src/components/inputs/formik/'
-import Autocomplete from 'src/components/inputs/formik/Autocomplete'
import { fromNamespace } from 'src/utils/config'
import { transformNumber } from 'src/utils/number'
@@ -79,9 +79,7 @@ const FiatBalanceOverrides = ({ config, section }) => {
const percentMax = 100
const validationSchema = Yup.object()
.shape({
- [MACHINE_KEY]: Yup.string()
- .label('Machine')
- .required(),
+ [MACHINE_KEY]: Yup.string().label('Machine').required(),
[CASHBOX_KEY]: Yup.number()
.label('Cash box')
.transform(transformNumber)
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/Setup.js b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Notifications/sections/Setup.js
rename to new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
index cd512b9e..67ad5c7a 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/Setup.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
@@ -1,7 +1,6 @@
import { makeStyles } from '@material-ui/core'
import * as R from 'ramda'
import React, { useContext } from 'react'
-
import {
Table,
THead,
@@ -10,6 +9,7 @@ import {
Td,
Th
} from 'src/components/fake-table/Table'
+
import { Switch } from 'src/components/inputs'
import { fromNamespace, toNamespace } from 'src/utils/config'
import { sentenceCase } from 'src/utils/string'
@@ -132,8 +132,9 @@ const Setup = ({ wizard, forceDisable }) => {
))}
- {namespaces.map(namespace => (
+ {namespaces.map((namespace, idx) => (
R.filter(it => it.class === type)
-
-const ThirdPartyProvider = () => {
- const { save, data: _data, error, accountsConfig } = useContext(
- NotificationsCtx
- )
-
- const data = fromNamespace('thirdParty')(_data)
-
- const filterOptions = type => filterClass(type)(accountsConfig || [])
-
- const getDisplayName = type => it =>
- R.compose(
- R.prop('display'),
- R.find(R.propEq('code', it))
- )(filterOptions(type))
-
- const innerSave = async value => {
- const config = toNamespace('thirdParty')(value?.thirdParty[0])
- await save('thirdParty', config)
- }
-
- const ThirdPartySchema = Yup.object().shape({
- sms: Yup.string('SMS must be a string').required('SMS is required'),
- email: Yup.string('Email must be a string').required('Email is required')
- })
-
- const elements = [
- {
- name: 'sms',
- size: 'sm',
- view: getDisplayName('sms'),
- width: 175,
- input: Autocomplete,
- inputProps: {
- options: filterOptions('sms'),
- valueProp: 'code',
- labelProp: 'display'
- }
- },
- {
- name: 'email',
- size: 'sm',
- view: getDisplayName('email'),
- width: 175,
- input: Autocomplete,
- inputProps: {
- options: filterOptions('email'),
- valueProp: 'code',
- labelProp: 'display'
- }
- }
- ]
- const values = {
- sms: data.sms ?? 'twilio',
- email: data.email ?? 'mailgun'
- }
-
- return (
- Values to attach
)}
- {R.map(
- it => (
-
- {R.map(
- ite => (
- {
- setFieldValue(
- 'message',
- values.message.concat(
- R.last(values.message) === ' ' ? '' : ' ',
- ite.code
- )
- )
- }}
- />
- ),
- it
- )}
-
- ),
- R.splitEvery(3, CHIPS[sms?.event])
- )}
+ {R.splitEvery(3, CHIPS[sms?.event]).map((it, idx) => (
+
+ {it.map((ite, idx2) => (
+ {
+ setFieldValue(
+ 'message',
+ values.message.concat(
+ R.last(values.message) === ' ' ? '' : ' ',
+ ite.code
+ )
+ )
+ }}
+ />
+ ))}
+
+ ))}
{getErrorMsg(errors, touched, creationError) && (
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.js b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.js
rename to new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
index d51932d1..10bea939 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.js
+++ b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
@@ -5,16 +5,16 @@ import { Form, Formik, Field as FormikField } from 'formik'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-import * as Yup from 'yup'
-
import ErrorMessage from 'src/components/ErrorMessage'
import PromptWhenDirty from 'src/components/PromptWhenDirty'
import { HelpTooltip } from 'src/components/Tooltip'
+import { H4, Info2, Info3, Label2, Label3, P } from 'src/components/typography'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
+import * as Yup from 'yup'
+
import { Link, IconButton, SupportLinkButton } from 'src/components/buttons'
import { Switch } from 'src/components/inputs'
import { TextInput } from 'src/components/inputs/formik'
-import { H4, Info2, Info3, Label2, Label3, P } from 'src/components/typography'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { global, fieldStyles } from './OperatorInfo.styles'
diff --git a/new-lamassu-admin/src/pages/ServerLogs.js b/new-lamassu-admin/src/pages/ServerLogs.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/ServerLogs.js
rename to new-lamassu-admin/src/pages/ServerLogs.jsx
index 3acff64b..0b436add 100644
--- a/new-lamassu-admin/src/pages/ServerLogs.js
+++ b/new-lamassu-admin/src/pages/ServerLogs.jsx
@@ -3,10 +3,11 @@ import { makeStyles } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState, useRef } from 'react'
-
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
import Title from 'src/components/Title'
import Uptime from 'src/components/Uptime'
+import { Info3, H4 } from 'src/components/typography'
+
import { Select } from 'src/components/inputs'
import {
Table,
@@ -16,7 +17,6 @@ import {
TableBody,
TableCell
} from 'src/components/table'
-import { Info3, H4 } from 'src/components/typography'
import typographyStyles from 'src/components/typography/styles'
import { offColor } from 'src/styling/variables'
import { startCase } from 'src/utils/string'
diff --git a/new-lamassu-admin/src/pages/Services/FormRenderer.js b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Services/FormRenderer.js
rename to new-lamassu-admin/src/pages/Services/FormRenderer.jsx
index ac0c0a5c..80f1e4ce 100644
--- a/new-lamassu-admin/src/pages/Services/FormRenderer.js
+++ b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
@@ -3,8 +3,8 @@ import classnames from 'classnames'
import { Formik, Form, FastField } from 'formik'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
+
import { Button } from 'src/components/buttons'
import { SecretInput } from 'src/components/inputs/formik'
import { spacer } from 'src/styling/variables'
diff --git a/new-lamassu-admin/src/pages/Services/Services.js b/new-lamassu-admin/src/pages/Services/Services.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Services/Services.js
rename to new-lamassu-admin/src/pages/Services/Services.jsx
index c1d5b408..4760f0fe 100644
--- a/new-lamassu-admin/src/pages/Services/Services.js
+++ b/new-lamassu-admin/src/pages/Services/Services.jsx
@@ -3,12 +3,12 @@ import { makeStyles, Grid } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import Modal from 'src/components/Modal'
-import { SecretInput } from 'src/components/inputs/formik'
import CheckboxInput from 'src/components/inputs/formik/Checkbox'
import TitleSection from 'src/components/layout/TitleSection'
import SingleRowTable from 'src/components/single-row-table/SingleRowTable'
+
+import { SecretInput } from 'src/components/inputs/formik'
import { formatLong } from 'src/utils/string'
import FormRenderer from './FormRenderer'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js
index 2e57b9a0..c440e60d 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js
@@ -15,7 +15,7 @@ const buildTestValidation = (id, passphrase) => {
.max(100, 'Too long')
.when(id, {
is: isDefined,
- then: Yup.string().test(secretTest(passphrase))
+ then: schema => schema.test(secretTest(passphrase))
})
}
diff --git a/new-lamassu-admin/src/pages/Services/schemas/elliptic.js b/new-lamassu-admin/src/pages/Services/schemas/elliptic.js
index 287a8fa6..41d0d810 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/elliptic.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/elliptic.js
@@ -1,8 +1,7 @@
-import * as Yup from 'yup'
-
import CheckboxFormik from 'src/components/inputs/formik/Checkbox'
import NumberInputFormik from 'src/components/inputs/formik/NumberInput'
import SecretInputFormik from 'src/components/inputs/formik/SecretInput'
+import * as Yup from 'yup'
import { secretTest, leadingZerosTest } from './helper'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/helper.js b/new-lamassu-admin/src/pages/Services/schemas/helper.js
index 58d97339..f4be746c 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/helper.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/helper.js
@@ -1,66 +1,64 @@
-import { ALL_CRYPTOS, utils as coinUtils } from '@lamassu/coins'
-import * as R from 'ramda'
-
-const WARNING_LEVELS = {
- CLEAN: 'clean',
- PARTIAL: 'partial',
- IMPORTANT: 'important'
-}
-
-const secretTest = (secret, message) => ({
- name: 'secret-test',
- message: message ? `The ${message} is invalid` : 'Invalid field',
- test(val) {
- if (R.isNil(secret) && R.isNil(val)) {
- return this.createError()
- }
- return true
- }
-})
-
-const leadingZerosTest = (value, context) => {
- if (
- R.startsWith('0', context.originalValue) &&
- R.length(context.originalValue) > 1
- ) {
- return context.createError()
- }
- return true
-}
-
-const buildCurrencyOptions = markets => {
- const prunedCoins = R.compose(
- R.uniq,
- R.map(coinUtils.getEquivalentCode)
- )(ALL_CRYPTOS)
- return R.map(it => {
- const unavailableCryptos = R.difference(prunedCoins, markets[it])
- const unavailableCryptosFiltered = R.difference(unavailableCryptos, [it]) // As the markets can have stablecoins to trade against other crypto, filter them out, as there can't be pairs such as USDT/USDT
-
- const unavailableMarketsStr =
- R.length(unavailableCryptosFiltered) > 1
- ? `${R.join(
- ', ',
- R.slice(0, -1, unavailableCryptosFiltered)
- )} and ${R.last(unavailableCryptosFiltered)}`
- : unavailableCryptosFiltered[0]
-
- const warningLevel = R.isEmpty(unavailableCryptosFiltered)
- ? WARNING_LEVELS.CLEAN
- : !R.isEmpty(unavailableCryptosFiltered) &&
- R.length(unavailableCryptosFiltered) < R.length(prunedCoins)
- ? WARNING_LEVELS.PARTIAL
- : WARNING_LEVELS.IMPORTANT
-
- return {
- code: R.toUpper(it),
- display: R.toUpper(it),
- warning: warningLevel,
- warningMessage: !R.isEmpty(unavailableCryptosFiltered)
- ? `No market pairs available for ${unavailableMarketsStr}`
- : `All market pairs are available`
- }
- }, R.keys(markets))
-}
-
-export { secretTest, leadingZerosTest, buildCurrencyOptions }
+import { ALL_CRYPTOS } from '@lamassu/coins/config/consts'
+import { getEquivalentCode } from '@lamassu/coins/lightUtils'
+import * as R from 'ramda'
+
+const WARNING_LEVELS = {
+ CLEAN: 'clean',
+ PARTIAL: 'partial',
+ IMPORTANT: 'important'
+}
+
+const secretTest = (secret, message) => ({
+ name: 'secret-test',
+ message: message ? `The ${message} is invalid` : 'Invalid field',
+ test(val) {
+ if (R.isNil(secret) && R.isNil(val)) {
+ return this.createError()
+ }
+ return true
+ }
+})
+
+const leadingZerosTest = (value, context) => {
+ if (
+ R.startsWith('0', context.originalValue) &&
+ R.length(context.originalValue) > 1
+ ) {
+ return context.createError()
+ }
+ return true
+}
+
+const buildCurrencyOptions = markets => {
+ const prunedCoins = R.compose(R.uniq, R.map(getEquivalentCode))(ALL_CRYPTOS)
+ return R.map(it => {
+ const unavailableCryptos = R.difference(prunedCoins, markets[it])
+ const unavailableCryptosFiltered = R.difference(unavailableCryptos, [it]) // As the markets can have stablecoins to trade against other crypto, filter them out, as there can't be pairs such as USDT/USDT
+
+ const unavailableMarketsStr =
+ R.length(unavailableCryptosFiltered) > 1
+ ? `${R.join(
+ ', ',
+ R.slice(0, -1, unavailableCryptosFiltered)
+ )} and ${R.last(unavailableCryptosFiltered)}`
+ : unavailableCryptosFiltered[0]
+
+ const warningLevel = R.isEmpty(unavailableCryptosFiltered)
+ ? WARNING_LEVELS.CLEAN
+ : !R.isEmpty(unavailableCryptosFiltered) &&
+ R.length(unavailableCryptosFiltered) < R.length(prunedCoins)
+ ? WARNING_LEVELS.PARTIAL
+ : WARNING_LEVELS.IMPORTANT
+
+ return {
+ code: R.toUpper(it),
+ display: R.toUpper(it),
+ warning: warningLevel,
+ warningMessage: !R.isEmpty(unavailableCryptosFiltered)
+ ? `No market pairs available for ${unavailableMarketsStr}`
+ : `All market pairs are available`
+ }
+ }, R.keys(markets))
+}
+
+export { secretTest, leadingZerosTest, buildCurrencyOptions }
diff --git a/new-lamassu-admin/src/pages/Services/schemas/inforu.js b/new-lamassu-admin/src/pages/Services/schemas/inforu.js
index 848e44ae..a334afe6 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/inforu.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/inforu.js
@@ -1,7 +1,6 @@
-import * as Yup from 'yup'
-
import SecretInputFormik from 'src/components/inputs/formik/SecretInput'
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
import { secretTest } from './helper'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/infura.js b/new-lamassu-admin/src/pages/Services/schemas/infura.js
index 3a4e27c3..8a18752b 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/infura.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/infura.js
@@ -1,6 +1,5 @@
-import * as Yup from 'yup'
-
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
export default {
code: 'infura',
diff --git a/new-lamassu-admin/src/pages/Services/schemas/mailgun.js b/new-lamassu-admin/src/pages/Services/schemas/mailgun.js
index 80e1f615..b01b84b7 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/mailgun.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/mailgun.js
@@ -1,6 +1,5 @@
-import * as Yup from 'yup'
-
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
export default {
code: 'mailgun',
diff --git a/new-lamassu-admin/src/pages/Services/schemas/scorechain.js b/new-lamassu-admin/src/pages/Services/schemas/scorechain.js
index 96d6675f..2ee4eb97 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/scorechain.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/scorechain.js
@@ -1,8 +1,7 @@
-import * as Yup from 'yup'
-
import CheckboxFormik from 'src/components/inputs/formik/Checkbox'
import NumberInputFormik from 'src/components/inputs/formik/NumberInput'
import SecretInputFormik from 'src/components/inputs/formik/SecretInput'
+import * as Yup from 'yup'
import { secretTest, leadingZerosTest } from './helper'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/telnyx.js b/new-lamassu-admin/src/pages/Services/schemas/telnyx.js
index 65db8ae7..ce11ed48 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/telnyx.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/telnyx.js
@@ -1,7 +1,6 @@
-import * as Yup from 'yup'
-
import SecretInputFormik from 'src/components/inputs/formik/SecretInput'
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
import { secretTest } from './helper'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/trongrid.js b/new-lamassu-admin/src/pages/Services/schemas/trongrid.js
index 8edbd3e8..affc3989 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/trongrid.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/trongrid.js
@@ -1,6 +1,5 @@
-import * as Yup from 'yup'
-
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
export default {
code: 'trongrid',
diff --git a/new-lamassu-admin/src/pages/Services/schemas/twilio.js b/new-lamassu-admin/src/pages/Services/schemas/twilio.js
index 4628edb3..756287a3 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/twilio.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/twilio.js
@@ -1,7 +1,6 @@
-import * as Yup from 'yup'
-
import SecretInputFormik from 'src/components/inputs/formik/SecretInput'
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
import { secretTest } from './helper'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/vonage.js b/new-lamassu-admin/src/pages/Services/schemas/vonage.js
index 01bb4b20..fb95023a 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/vonage.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/vonage.js
@@ -1,7 +1,6 @@
-import * as Yup from 'yup'
-
import SecretInputFormik from 'src/components/inputs/formik/SecretInput'
import TextInputFormik from 'src/components/inputs/formik/TextInput'
+import * as Yup from 'yup'
import { secretTest } from './helper'
diff --git a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
rename to new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx
index bc7fbe02..cfc80b87 100644
--- a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
+++ b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx
@@ -2,12 +2,12 @@ import { useQuery, useMutation } from '@apollo/react-hooks'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React from 'react'
+import TitleSection from 'src/components/layout/TitleSection'
+import DataTable from 'src/components/tables/DataTable'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
import parser from 'ua-parser-js'
import { IconButton } from 'src/components/buttons'
-import TitleSection from 'src/components/layout/TitleSection'
-import DataTable from 'src/components/tables/DataTable'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
import { formatDate } from 'src/utils/timezones'
const GET_SESSIONS = gql`
diff --git a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
similarity index 96%
rename from new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js
rename to new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
index b6c63914..32ccb5b5 100644
--- a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js
+++ b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
@@ -3,9 +3,9 @@ import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
import { CopyToClipboard as ReactCopyToClipboard } from 'react-copy-to-clipboard'
-
import Popover from 'src/components/Popper'
-import { ReactComponent as CopyIcon } from 'src/styling/icons/action/copy/copy.svg'
+import CopyIcon from 'src/styling/icons/action/copy/copy.svg?react'
+
import { comet } from 'src/styling/variables'
import { cpcStyles } from './Transactions.styles'
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
similarity index 85%
rename from new-lamassu-admin/src/pages/Transactions/DetailsCard.js
rename to new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
index 4e65014d..365e5b52 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
@@ -1,5 +1,5 @@
import { useLazyQuery, useMutation } from '@apollo/react-hooks'
-import { utils as coinUtils } from '@lamassu/coins'
+import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
import { makeStyles, Box } from '@material-ui/core'
import BigNumber from 'bignumber.js'
import classNames from 'classnames'
@@ -9,30 +9,29 @@ import gql from 'graphql-tag'
import JSZip from 'jszip'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
-
import { ConfirmDialog } from 'src/components/ConfirmDialog'
import { HelpTooltip } from 'src/components/Tooltip'
-import { IDButton, ActionButton } from 'src/components/buttons'
import { P, Label1 } from 'src/components/typography'
-import { ReactComponent as CardIdInverseIcon } from 'src/styling/icons/ID/card/white.svg'
-import { ReactComponent as CardIdIcon } from 'src/styling/icons/ID/card/zodiac.svg'
-import { ReactComponent as PhoneIdInverseIcon } from 'src/styling/icons/ID/phone/white.svg'
-import { ReactComponent as PhoneIdIcon } from 'src/styling/icons/ID/phone/zodiac.svg'
-import { ReactComponent as CamIdInverseIcon } from 'src/styling/icons/ID/photo/white.svg'
-import { ReactComponent as CamIdIcon } from 'src/styling/icons/ID/photo/zodiac.svg'
-import { ReactComponent as CancelInverseIcon } from 'src/styling/icons/button/cancel/white.svg'
-import { ReactComponent as CancelIcon } from 'src/styling/icons/button/cancel/zodiac.svg'
-import { ReactComponent as DownloadInverseIcon } from 'src/styling/icons/button/download/white.svg'
-import { ReactComponent as Download } from 'src/styling/icons/button/download/zodiac.svg'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
+import CardIdInverseIcon from 'src/styling/icons/ID/card/white.svg?react'
+import CardIdIcon from 'src/styling/icons/ID/card/zodiac.svg?react'
+import PhoneIdInverseIcon from 'src/styling/icons/ID/phone/white.svg?react'
+import PhoneIdIcon from 'src/styling/icons/ID/phone/zodiac.svg?react'
+import CamIdInverseIcon from 'src/styling/icons/ID/photo/white.svg?react'
+import CamIdIcon from 'src/styling/icons/ID/photo/zodiac.svg?react'
+import CancelInverseIcon from 'src/styling/icons/button/cancel/white.svg?react'
+import CancelIcon from 'src/styling/icons/button/cancel/zodiac.svg?react'
+import DownloadInverseIcon from 'src/styling/icons/button/download/white.svg?react'
+import Download from 'src/styling/icons/button/download/zodiac.svg?react'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+
+import { IDButton, ActionButton } from 'src/components/buttons'
import {
primaryColor,
subheaderColor,
errorColor,
offErrorColor
} from 'src/styling/variables'
-import { URI } from 'src/utils/apollo'
import { SWEEPABLE_CRYPTOS } from 'src/utils/constants'
import * as Customer from 'src/utils/customer'
@@ -87,12 +86,10 @@ const CANCEL_CASH_IN_TRANSACTION = gql`
`
const getCryptoAmount = tx =>
- coinUtils.toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode).toNumber()
+ toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode).toNumber()
const getCryptoFeeAmount = tx => {
- const feeAmount = coinUtils
- .toUnit(new BigNumber(tx.fee), tx.cryptoCode)
- .toNumber()
+ const feeAmount = toUnit(new BigNumber(tx.fee), tx.cryptoCode).toNumber()
return new BigNumber(feeAmount)
.times(tx.rawTickerPrice)
@@ -101,7 +98,7 @@ const getCryptoFeeAmount = tx => {
}
const formatAddress = (cryptoCode = '', address = '') =>
- coinUtils.formatCryptoAddress(cryptoCode, address).replace(/(.{5})/g, '$1 ')
+ formatCryptoAddress(cryptoCode, address).replace(/(.{5})/g, '$1 ')
const Label = ({ children }) => {
const classes = useStyles()
@@ -135,14 +132,10 @@ const DetailsRow = ({ it: tx, timezone }) => {
Number.parseFloat(tx.commissionPercentage, 2) * 100
).toFixed(2, 1) // ROUND_DOWN
const fixedFee = Number.parseFloat(tx.fixedFee) || 0
- const fiat = BigNumber(tx.fiat)
- .minus(fixedFee)
- .toFixed(2, 1) // ROUND_DOWN
+ const fiat = BigNumber(tx.fiat).minus(fixedFee).toFixed(2, 1) // ROUND_DOWN
const crypto = getCryptoAmount(tx)
const cryptoFee = tx.fee ? `${getCryptoFeeAmount(tx)} ${tx.fiatCode}` : 'N/A'
- const exchangeRate = BigNumber(fiat)
- .div(crypto)
- .toFixed(2, 1) // ROUND_DOWN
+ const exchangeRate = BigNumber(fiat).div(crypto).toFixed(2, 1) // ROUND_DOWN
const displayExRate = `1 ${tx.cryptoCode} = ${exchangeRate} ${tx.fiatCode}`
const discount = tx.discount ? `-${tx.discount}%` : null
@@ -205,25 +198,23 @@ const DetailsRow = ({ it: tx, timezone }) => {
const walletScoreEl = (
{
InverseIcon={CardIdInverseIcon}>
@@ -323,7 +314,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
Icon={CamIdIcon}
InverseIcon={CamIdInverseIcon}>
@@ -334,7 +325,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
Icon={CamIdIcon}
InverseIcon={CamIdInverseIcon}>
diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx
similarity index 94%
rename from new-lamassu-admin/src/pages/Transactions/Transactions.js
rename to new-lamassu-admin/src/pages/Transactions/Transactions.jsx
index 8fe9c986..b8afa09a 100644
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx
@@ -1,23 +1,23 @@
import { useQuery } from '@apollo/react-hooks'
-import { utils as coinUtils } from '@lamassu/coins'
+import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
import { makeStyles } from '@material-ui/core'
import BigNumber from 'bignumber.js'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useEffect, useState } from 'react'
import { useHistory } from 'react-router-dom'
-
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
import SearchBox from 'src/components/SearchBox'
import SearchFilter from 'src/components/SearchFilter'
import Title from 'src/components/Title'
import { HelpTooltip } from 'src/components/Tooltip'
-import { SupportLinkButton } from 'src/components/buttons'
import DataTable from 'src/components/tables/DataTable'
-import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
-import { ReactComponent as CustomerLinkIcon } from 'src/styling/icons/month arrows/right.svg'
-import { ReactComponent as CustomerLinkWhiteIcon } from 'src/styling/icons/month arrows/right_white.svg'
+import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
+import CustomerLinkIcon from 'src/styling/icons/month arrows/right.svg?react'
+import CustomerLinkWhiteIcon from 'src/styling/icons/month arrows/right_white.svg?react'
+
+import { SupportLinkButton } from 'src/components/buttons'
import { errorColor } from 'src/styling/variables'
import * as Customer from 'src/utils/customer'
import { formatDate } from 'src/utils/timezones'
@@ -214,13 +214,13 @@ const Transactions = () => {
textAlign: 'right',
size: 'sm',
view: it =>
- `${coinUtils.toUnit(new BigNumber(it.cryptoAtoms), it.cryptoCode)} ${
+ `${toUnit(new BigNumber(it.cryptoAtoms), it.cryptoCode)} ${
it.cryptoCode
}`
},
{
header: 'Address',
- view: it => coinUtils.formatCryptoAddress(it.cryptoCode, it.toAddress),
+ view: it => formatCryptoAddress(it.cryptoCode, it.toAddress),
className: classes.overflowTd,
size: 'sm',
width: 140
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx
similarity index 97%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx
index d478a842..079a6756 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx
@@ -4,13 +4,13 @@ import classnames from 'classnames'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import { DeleteDialog } from 'src/components/DeleteDialog'
-import { IconButton, Button, Link } from 'src/components/buttons'
import DataTable from 'src/components/tables/DataTable'
import { Info1, Info3, P } from 'src/components/typography'
-import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
+import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react'
+import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
+
+import { IconButton, Button, Link } from 'src/components/buttons'
import { fromNamespace, namespaces, toNamespace } from 'src/utils/config'
import styles from './CustomInfoRequests.styles'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
index dda9bb4c..9d056395 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
@@ -1,7 +1,6 @@
import { makeStyles } from '@material-ui/core'
import classnames from 'classnames'
import React from 'react'
-
import { Label1, Info2 } from 'src/components/typography'
const styles = {
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.jsx
similarity index 83%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.jsx
index 2efeea83..c70b732c 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.jsx
@@ -1,12 +1,12 @@
import { Field } from 'formik'
import React from 'react'
-import * as Yup from 'yup'
-
import ToggleButtonGroup from 'src/components/inputs/formik/ToggleButtonGroup'
import { H4 } from 'src/components/typography'
-import { ReactComponent as Keyboard } from 'src/styling/icons/compliance/keyboard.svg'
-import { ReactComponent as Keypad } from 'src/styling/icons/compliance/keypad.svg'
-import { ReactComponent as List } from 'src/styling/icons/compliance/list.svg'
+import Keyboard from 'src/styling/icons/compliance/keyboard.svg?react'
+import Keypad from 'src/styling/icons/compliance/keypad.svg?react'
+import List from 'src/styling/icons/compliance/list.svg?react'
+import * as Yup from 'yup'
+
import { zircon } from 'src/styling/variables'
const MakeIcon = IconSvg => (
@@ -65,9 +65,7 @@ const ChooseType = () => {
}
const validationSchema = Yup.object().shape({
- inputType: Yup.string()
- .label('Input type')
- .required()
+ inputType: Yup.string().label('Input type').required()
})
const defaultValues = {
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.jsx
index a9ef4593..1f0b9b14 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.jsx
@@ -1,10 +1,9 @@
import { Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
-import * as Yup from 'yup'
-
import TextInputFormik from 'src/components/inputs/formik/TextInput'
import { H4, P } from 'src/components/typography'
+import * as Yup from 'yup'
const NameOfRequirement = () => {
return (
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.jsx
similarity index 87%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.jsx
index c7f0de6d..4e338d5f 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.jsx
@@ -1,9 +1,8 @@
import { Field } from 'formik'
import React from 'react'
-import * as Yup from 'yup'
-
import TextInputFormik from 'src/components/inputs/formik/TextInput'
import { H4, P } from 'src/components/typography'
+import * as Yup from 'yup'
const Screen1Information = () => {
return (
@@ -32,12 +31,8 @@ const Screen1Information = () => {
}
const validationSchema = Yup.object().shape({
- screen1Title: Yup.string()
- .label('Screen title')
- .required(),
- screen1Text: Yup.string()
- .label('Screen text')
- .required()
+ screen1Title: Yup.string().label('Screen title').required(),
+ screen1Text: Yup.string().label('Screen text').required()
})
const defaultValues = {
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.jsx
similarity index 86%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.jsx
index 0003dd1c..0f455cb5 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.jsx
@@ -1,9 +1,8 @@
import { Field } from 'formik'
import React from 'react'
-import * as Yup from 'yup'
-
import TextInputFormik from 'src/components/inputs/formik/TextInput'
import { H4, P } from 'src/components/typography'
+import * as Yup from 'yup'
const ScreenInformation = () => {
return (
@@ -30,12 +29,8 @@ const ScreenInformation = () => {
}
const validationSchema = Yup.object().shape({
- screen2Title: Yup.string()
- .label('Screen title')
- .required(),
- screen2Text: Yup.string()
- .label('Screen text')
- .required()
+ screen2Title: Yup.string().label('Screen title').required(),
+ screen2Text: Yup.string().label('Screen text').required()
})
const defaultValues = {
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx
similarity index 94%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx
index 20a82f82..91f66b19 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx
@@ -3,13 +3,12 @@ import classnames from 'classnames'
import { Field, useFormikContext, FieldArray } from 'formik'
import * as R from 'ramda'
import React, { useEffect, useRef } from 'react'
-
import Button from 'src/components/buttons/ActionButton'
import RadioGroup from 'src/components/inputs/formik/RadioGroup'
import TextInput from 'src/components/inputs/formik/TextInput'
import { H4 } from 'src/components/typography'
-import { ReactComponent as AddIconInverse } from 'src/styling/icons/button/add/white.svg'
-import { ReactComponent as AddIcon } from 'src/styling/icons/button/add/zodiac.svg'
+import AddIconInverse from 'src/styling/icons/button/add/white.svg?react'
+import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react'
import styles from './formStyles.styles'
const useStyles = makeStyles(styles)
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx
index 7f68c8ee..49985224 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx
@@ -3,7 +3,6 @@ import classnames from 'classnames'
import { Field, useFormikContext } from 'formik'
import * as R from 'ramda'
import React from 'react'
-
import NumberInput from 'src/components/inputs/formik/NumberInput'
import RadioGroup from 'src/components/inputs/formik/RadioGroup'
import { TL1, H4 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx
similarity index 99%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx
index 27bfb226..f5baec02 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx
@@ -3,7 +3,6 @@ import classnames from 'classnames'
import { Field, useFormikContext } from 'formik'
import * as R from 'ramda'
import React from 'react'
-
import RadioGroup from 'src/components/inputs/formik/RadioGroup'
import TextInput from 'src/components/inputs/formik/TextInput'
import { H4 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.jsx
similarity index 71%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.jsx
index 2516d37e..a8d15192 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.jsx
@@ -40,38 +40,27 @@ const validationSchema = Yup.lazy(values => {
switch (values.inputType) {
case 'numerical':
return Yup.object({
- constraintType: Yup.string()
- .label('Constraint type')
- .required(),
+ constraintType: Yup.string().label('Constraint type').required(),
inputLength: Yup.number().when('constraintType', {
is: 'length',
- then: Yup.number()
- .min(0)
- .required('The number of digits is required'),
- else: Yup.mixed().notRequired()
+ then: schema =>
+ schema.min(0).required('The number of digits is required'),
+ otherwise: schema => schema.mixed().notRequired()
})
})
case 'text':
return Yup.object({
- constraintType: Yup.string()
- .label('Constraint type')
- .required(),
- inputLabel1: Yup.string()
- .label('Text entry label')
- .required(),
+ constraintType: Yup.string().label('Constraint type').required(),
+ inputLabel1: Yup.string().label('Text entry label').required(),
inputLabel2: Yup.string().when('constraintType', {
is: 'spaceSeparation',
- then: Yup.string()
- .label('Second word label')
- .required(),
- else: Yup.mixed().notRequired()
+ then: schema => schema.label('Second word label').required(),
+ otherwise: schema => schema.mixed().notRequired()
})
})
case 'choiceList':
return Yup.object({
- constraintType: Yup.string()
- .label('Constraint type')
- .required(),
+ constraintType: Yup.string().label('Constraint type').required(),
listChoices: Yup.array().test(
'has-2-or-more',
'Choice list needs to have two or more non empty fields',
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx
index ddb020d9..e4d75857 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx
@@ -2,10 +2,10 @@ import { makeStyles } from '@material-ui/core'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
import Stepper from 'src/components/Stepper'
+
import { Button } from 'src/components/buttons'
import ChooseType, {
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx
similarity index 93%
rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.js
rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx
index 494d5775..17352b54 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx
@@ -1,9 +1,9 @@
import { makeStyles } from '@material-ui/core'
import React from 'react'
+import { H1, P } from 'src/components/typography'
+import CustomReqLogo from 'src/styling/icons/compliance/custom-requirement.svg?react'
import { Button } from 'src/components/buttons'
-import { H1, P } from 'src/components/typography'
-import { ReactComponent as CustomReqLogo } from 'src/styling/icons/compliance/custom-requirement.svg'
const styles = {
logo: {
diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.js b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Triggers/TriggerView.js
rename to new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
index 5333184a..4034580a 100644
--- a/new-lamassu-admin/src/pages/Triggers/TriggerView.js
+++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
@@ -3,11 +3,11 @@ import { makeStyles, Box } from '@material-ui/core'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
+import { H2 } from 'src/components/typography'
import { v4 } from 'uuid'
import { Button } from 'src/components/buttons'
import { Table as EditableTable } from 'src/components/editableTable'
-import { H2 } from 'src/components/typography'
import { fromNamespace, namespaces } from 'src/utils/config'
import styles from './Triggers.styles'
diff --git a/new-lamassu-admin/src/pages/Triggers/Triggers.js b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
similarity index 94%
rename from new-lamassu-admin/src/pages/Triggers/Triggers.js
rename to new-lamassu-admin/src/pages/Triggers/Triggers.jsx
index 02a9fc49..bb57dc26 100644
--- a/new-lamassu-admin/src/pages/Triggers/Triggers.js
+++ b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
@@ -4,19 +4,19 @@ import classnames from 'classnames'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState } from 'react'
-
import Modal from 'src/components/Modal'
import { HelpTooltip } from 'src/components/Tooltip'
-import { Link, SupportLinkButton } from 'src/components/buttons'
-import { Switch } from 'src/components/inputs'
import TitleSection from 'src/components/layout/TitleSection'
import { P, Label2 } from 'src/components/typography'
import FormRenderer from 'src/pages/Services/FormRenderer'
+import ReverseCustomInfoIcon from 'src/styling/icons/circle buttons/filter/white.svg?react'
+import CustomInfoIcon from 'src/styling/icons/circle buttons/filter/zodiac.svg?react'
+import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white.svg?react'
+import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react'
+
+import { Link, SupportLinkButton } from 'src/components/buttons'
+import { Switch } from 'src/components/inputs'
import twilioSchema from 'src/pages/Services/schemas/twilio'
-import { ReactComponent as ReverseCustomInfoIcon } from 'src/styling/icons/circle buttons/filter/white.svg'
-import { ReactComponent as CustomInfoIcon } from 'src/styling/icons/circle buttons/filter/zodiac.svg'
-import { ReactComponent as ReverseSettingsIcon } from 'src/styling/icons/circle buttons/settings/white.svg'
-import { ReactComponent as SettingsIcon } from 'src/styling/icons/circle buttons/settings/zodiac.svg'
import { fromNamespace, toNamespace } from 'src/utils/config'
import CustomInfoRequests from './CustomInfoRequests'
@@ -65,9 +65,8 @@ const Triggers = () => {
const classes = useStyles()
const [wizardType, setWizard] = useState(false)
const { data, loading: configLoading, refetch } = useQuery(GET_CONFIG)
- const { data: customInfoReqData, loading: customInfoLoading } = useQuery(
- GET_CUSTOM_REQUESTS
- )
+ const { data: customInfoReqData, loading: customInfoLoading } =
+ useQuery(GET_CUSTOM_REQUESTS)
const [error, setError] = useState(null)
const [subMenu, setSubMenu] = useState(false)
diff --git a/new-lamassu-admin/src/pages/Triggers/Wizard.js b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx
similarity index 100%
rename from new-lamassu-admin/src/pages/Triggers/Wizard.js
rename to new-lamassu-admin/src/pages/Triggers/Wizard.jsx
index 8b978410..4b0b0002 100644
--- a/new-lamassu-admin/src/pages/Triggers/Wizard.js
+++ b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx
@@ -2,12 +2,12 @@ import { makeStyles } from '@material-ui/core'
import { Form, Formik, useFormikContext } from 'formik'
import * as R from 'ramda'
import React, { useState, Fragment, useEffect } from 'react'
-
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
import Stepper from 'src/components/Stepper'
-import { Button } from 'src/components/buttons'
import { H5, Info3 } from 'src/components/typography'
+
+import { Button } from 'src/components/buttons'
import { comet } from 'src/styling/variables'
import { singularOrPlural } from 'src/utils/string'
diff --git a/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.js b/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.jsx
similarity index 98%
rename from new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.js
rename to new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.jsx
index 038a6825..dbb86200 100644
--- a/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.js
+++ b/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.jsx
@@ -2,9 +2,9 @@ import { useMutation, useQuery } from '@apollo/react-hooks'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
+import Section from 'src/components/layout/Section'
import { Table as EditableTable } from 'src/components/editableTable'
-import Section from 'src/components/layout/Section'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import {
@@ -45,9 +45,8 @@ const AdvancedTriggersSettings = memo(() => {
const [isEditingOverrides, setEditingOverrides] = useState(false)
const { data, loading: configLoading } = useQuery(GET_INFO)
- const { data: customInfoReqData, loading: customInfoLoading } = useQuery(
- GET_CUSTOM_REQUESTS
- )
+ const { data: customInfoReqData, loading: customInfoLoading } =
+ useQuery(GET_CUSTOM_REQUESTS)
const customInfoRequests =
R.path(['customInfoRequests'])(customInfoReqData) ?? []
diff --git a/new-lamassu-admin/src/pages/Triggers/components/helper.js b/new-lamassu-admin/src/pages/Triggers/components/helper.js
index 1ab870b8..f1ab47b3 100644
--- a/new-lamassu-admin/src/pages/Triggers/components/helper.js
+++ b/new-lamassu-admin/src/pages/Triggers/components/helper.js
@@ -1,8 +1,7 @@
import * as R from 'ramda'
-import * as Yup from 'yup'
-
-import Autocomplete from 'src/components/inputs/formik/Autocomplete.js'
+import Autocomplete from 'src/components/inputs/formik/Autocomplete'
import { getView } from 'src/pages/Triggers/helper'
+import * as Yup from 'yup'
const buildAdvancedRequirementOptions = customInfoRequests => {
const base = [
@@ -31,9 +30,7 @@ const displayRequirement = (code, customInfoRequests) => {
}
const defaultSchema = Yup.object().shape({
- expirationTime: Yup.string()
- .label('Expiration time')
- .required(),
+ expirationTime: Yup.string().label('Expiration time').required(),
automation: Yup.string()
.label('Automation')
.matches(/(Manual|Automatic)/)
@@ -61,9 +58,7 @@ const getOverridesSchema = (values, customInfoRequests) => {
return true
}
}),
- expirationTime: Yup.string()
- .label('Expiration time')
- .required(),
+ expirationTime: Yup.string().label('Expiration time').required(),
automation: Yup.string()
.label('Automation')
.matches(/(Manual|Automatic)/)
diff --git a/new-lamassu-admin/src/pages/Triggers/helper.js b/new-lamassu-admin/src/pages/Triggers/helper.jsx
similarity index 95%
rename from new-lamassu-admin/src/pages/Triggers/helper.js
rename to new-lamassu-admin/src/pages/Triggers/helper.jsx
index 7ede67b2..a0e613ee 100644
--- a/new-lamassu-admin/src/pages/Triggers/helper.js
+++ b/new-lamassu-admin/src/pages/Triggers/helper.jsx
@@ -3,16 +3,16 @@ import classnames from 'classnames'
import { Field, useFormikContext } from 'formik'
import * as R from 'ramda'
import React, { memo } from 'react'
+import { H4, Label2, Label1, Info1, Info2 } from 'src/components/typography'
import * as Yup from 'yup'
import { NumberInput, RadioGroup, Dropdown } from 'src/components/inputs/formik'
-import { H4, Label2, Label1, Info1, Info2 } from 'src/components/typography'
import { errorColor } from 'src/styling/variables'
import { transformNumber } from 'src/utils/number'
import { onlyFirstToUpper } from 'src/utils/string'
-// import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
-// import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
+// import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react'
+// import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
const useStyles = makeStyles({
radioLabel: {
@@ -110,9 +110,7 @@ const threshold = Yup.object().shape({
const requirement = Yup.object().shape({
requirement: Yup.string().required(),
- suspensionDays: Yup.number()
- .transform(transformNumber)
- .nullable()
+ suspensionDays: Yup.number().transform(transformNumber).nullable()
})
const Schema = Yup.object()
@@ -266,12 +264,8 @@ const typeSchema = Yup.object()
'The trigger type is required'
),
threshold: Yup.object({
- threshold: Yup.number()
- .transform(transformNumber)
- .nullable(),
- thresholdDays: Yup.number()
- .transform(transformNumber)
- .nullable()
+ threshold: Yup.number().transform(transformNumber).nullable(),
+ thresholdDays: Yup.number().transform(transformNumber).nullable()
})
})
.test(({ threshold, triggerType }, context) => {
@@ -327,13 +321,8 @@ const typeOptions = [
const Type = ({ ...props }) => {
const classes = useStyles()
- const {
- errors,
- touched,
- values,
- setTouched,
- handleChange
- } = useFormikContext()
+ const { errors, touched, values, setTouched, handleChange } =
+ useFormikContext()
const typeClass = {
[classes.error]: errors.triggerType && touched.triggerType
@@ -484,26 +473,16 @@ const requirementSchema = Yup.object()
requirement: Yup.string().required(),
suspensionDays: Yup.number().when('requirement', {
is: value => value === 'suspend',
- then: Yup.number()
- .nullable()
- .transform(transformNumber),
- otherwise: Yup.number()
- .nullable()
- .transform(() => null)
+ then: schema => schema.nullable().transform(transformNumber),
+ otherwise: schema => schema.nullable().transform(() => null)
}),
customInfoRequestId: Yup.string().when('requirement', {
- is: value => value === 'custom',
- then: Yup.string(),
- otherwise: Yup.string()
- .nullable()
- .transform(() => '')
+ is: value => value !== 'custom',
+ then: schema => schema.nullable().transform(() => '')
}),
externalService: Yup.string().when('requirement', {
- is: value => value === 'external',
- then: Yup.string(),
- otherwise: Yup.string()
- .nullable()
- .transform(() => '')
+ is: value => value !== 'external',
+ then: schema => schema.nullable().transform(() => '')
})
}).required()
})
@@ -585,13 +564,8 @@ const Requirement = ({
customInfoRequests = []
}) => {
const classes = useStyles()
- const {
- touched,
- errors,
- values,
- handleChange,
- setTouched
- } = useFormikContext()
+ const { touched, errors, values, handleChange, setTouched } =
+ useFormikContext()
const isSuspend = values?.requirement?.requirement === 'suspend'
const isCustom = values?.requirement?.requirement === 'custom'
@@ -768,9 +742,9 @@ const RequirementInput = ({ customInfoRequests = [] }) => {
R.path(['requirement', 'customInfoRequestId'])(values) ?? ''
const isSuspend = requirement === 'suspend'
const display = customRequestId
- ? R.path(['customRequest', 'name'])(
+ ? (R.path(['customRequest', 'name'])(
R.find(customReqIdMatches(customRequestId))(customInfoRequests)
- ) ?? ''
+ ) ?? '')
: getView(requirementOptions, 'display')(requirement)
return (
@@ -800,12 +774,12 @@ const RequirementView = ({
const classes = useStyles()
const display =
requirement === 'custom'
- ? R.path(['customRequest', 'name'])(
+ ? (R.path(['customRequest', 'name'])(
R.find(customReqIdMatches(customInfoRequestId))(customInfoRequests)
- ) ?? ''
+ ) ?? '')
: requirement === 'external'
- ? `External verification (${onlyFirstToUpper(externalService)})`
- : getView(requirementOptions, 'display')(requirement)
+ ? `External verification (${onlyFirstToUpper(externalService)})`
+ : getView(requirementOptions, 'display')(requirement)
const isSuspend = requirement === 'suspend'
return (