- We can automatically assume you emptied a bill validator's cash
- box when the machine detects that it has been removed.
-
-
-
- Assume the cash box is emptied whenever it's removed, creating a
- new batch on the history screen and setting its current balance to
- zero.
-
-
-
- Cash boxes won't be assumed emptied when removed, nor their counts
- modified. Instead, to update the count and create a new batch,
- you'll click the 'Edit' button on this panel.
-
+ We can automatically assume you emptied a bill validator's cash
+ box when the machine detects that it has been removed.
+
+
+
+ Assume the cash box is emptied whenever it's removed, creating a
+ new batch on the history screen and setting its current balance to
+ zero.
+
+
+
+ Cash boxes won't be assumed emptied when removed, nor their counts
+ modified. Instead, to update the count and create a new batch,
+ you'll click the 'Edit' button on this panel.
+
+
+
+
+
+ )}
+ ));
}
export default CashCassettes
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
index 1a6c0e88..bbbab515 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx
index dad71c89..580fa0be 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React from 'react'
// import * as Yup from 'yup'
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
index 14e029d5..797f312a 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
@@ -1,5 +1,5 @@
-import { Grid /*, Divider */ } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
+import Grid from '@mui/material/Grid'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js
index 5b5222e5..7ac4426f 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 { alpha } from '@material-ui/core/styles/colorManipulator'
+import { alpha } from '@mui/material/styles'
import {
detailsRowStyles,
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx
index cdff0572..3b0abdc4 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import { formatDistance } from 'date-fns'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx
index 549b798b..921e189b 100644
--- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H1, P, Info2 } from 'src/components/typography'
import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx
index 3b1ccab5..42186e38 100644
--- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Formik, Form, Field } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Maintenance/helper.jsx b/new-lamassu-admin/src/pages/Maintenance/helper.jsx
index acc6ef1e..19e21f60 100644
--- a/new-lamassu-admin/src/pages/Maintenance/helper.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/helper.jsx
@@ -132,10 +132,11 @@ const getElements = (
onClick={() => {
!R.isNil(setMachineId) && setMachineId(m.id ?? m.deviceId)
setWizard(true)
- }}>
+ }}
+ size="large">
- )
+ );
}
}
]
diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
index 16aec872..2fca1331 100644
--- a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
+++ b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H4 } from 'src/components/typography'
import DisabledEditIcon from 'src/styling/icons/action/edit/disabled.svg?react'
@@ -20,7 +20,8 @@ const Header = ({ title, editing, disabled, setEditing }) => {
setEditing(true)}
className={classes.button}
- disabled={disabled}>
+ disabled={disabled}
+ size="large">
{disabled ? : }
)}
@@ -35,7 +36,7 @@ const Header = ({ title, editing, disabled, setEditing }) => {
)}
- )
+ );
}
export default Header
diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
index 35917013..05cf20f6 100644
--- a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
+++ b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { useFormikContext, Field as FormikField } from 'formik'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx
index 5a81bf34..10c105ba 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx
+++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React, { useContext } from 'react'
import NotificationsCtx from '../NotificationsContext'
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx
index b3461aab..86e40da4 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx
+++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useContext } from 'react'
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
index 67ad5c7a..130b7525 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
+++ b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
@@ -1,4 +1,5 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
+import Switch from '@mui/material/Switch'
import * as R from 'ramda'
import React, { useContext } from 'react'
import {
@@ -10,7 +11,6 @@ import {
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'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx
index edb58b73..91969087 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx
@@ -1,11 +1,11 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
+import Switch from '@mui/material/Switch'
import React, { memo } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
import { H4, P, Label2 } from 'src/components/typography'
import { BooleanPropertiesTable } from 'src/components/booleanPropertiesTable'
-import { Switch } from 'src/components/inputs'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { SupportLinkButton } from '../../components/buttons'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx
index 33e4b487..2b26b873 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
+import Switch from '@mui/material/Switch'
import classnames from 'classnames'
import { Form, Formik, Field as FormikField } from 'formik'
import * as R from 'ramda'
@@ -7,7 +8,6 @@ import React, { useState } from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
import PromptWhenDirty from 'src/components/PromptWhenDirty'
import { HelpTooltip } from 'src/components/Tooltip'
-import Switch from 'src/components/inputs/base/Switch'
import { P, H4, Info3, Label1, Label2, Label3 } from 'src/components/typography'
import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react'
import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
@@ -221,7 +221,8 @@ const ContactInfo = ({ wizard }) => {
{!editing && (
setEditing(true)}>
+ onClick={() => setEditing(true)}
+ size="large">
)}
@@ -311,7 +312,7 @@ const ContactInfo = ({ wizard }) => {
)}
- )
+ );
}
export default ContactInfo
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx
index fbac6725..d66ed288 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx
@@ -1,10 +1,10 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
+import Switch from '@mui/material/Switch'
import * as R from 'ramda'
import React, { memo } from 'react'
import { H4, P, Label2 } from 'src/components/typography'
-import { Switch } from 'src/components/inputs'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { global } from './OperatorInfo.styles'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx
index 759108b2..3d22330e 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx
@@ -1,12 +1,12 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
+import Switch from '@mui/material/Switch'
import * as R from 'ramda'
import React, { memo } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
import { H4, P, Label2 } from 'src/components/typography'
import { BooleanPropertiesTable } from 'src/components/booleanPropertiesTable'
-import { Switch } from 'src/components/inputs'
import { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { SupportLinkButton } from '../../components/buttons'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx
index 09e00eed..0b33e062 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx
@@ -1,5 +1,7 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Paper } from '@material-ui/core'
+import Paper from '@mui/material/Paper'
+import Switch from '@mui/material/Switch'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
@@ -11,7 +13,6 @@ import ExpandIconOpen from 'src/styling/icons/action/expand/open.svg?react'
import WhiteLogo from 'src/styling/icons/menu/logo-white.svg?react'
import { IconButton, SupportLinkButton } from 'src/components/buttons'
-import { Switch } from 'src/components/inputs'
import { formatDate } from 'src/utils/timezones'
import styles from './SMSNotices.styles'
@@ -180,7 +181,8 @@ const SMSNotices = () => {
setPreviewOpen(false)
setSelectedSMS(it)
setShowModal(true)
- }}>
+ }}
+ size="large">
)
@@ -221,7 +223,8 @@ const SMSNotices = () => {
R.equals(selectedSMS, it)
? setPreviewOpen(!previewOpen)
: setPreviewOpen(true)
- }}>
+ }}
+ size="large">
{R.equals(selectedSMS, it) && previewOpen ? (
) : (
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
index b5faa683..745891b7 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Chip } from '@material-ui/core'
+import Chip from '@mui/material/Chip'
+import { makeStyles } from '@mui/styles'
import { Form, Formik, Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
index 5d9a0e0c..f5b03a3d 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
+import Switch from '@mui/material/Switch'
import classnames from 'classnames'
import { Form, Formik, Field as FormikField } from 'formik'
import * as R from 'ramda'
@@ -12,7 +13,6 @@ 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 { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
@@ -233,7 +233,8 @@ const TermsConditions = () => {
{!editing && (
setEditing(true)}>
+ onClick={() => setEditing(true)}
+ size="large">
)}
@@ -287,7 +288,7 @@ const TermsConditions = () => {
)}
- )
+ );
}
export default TermsConditions
diff --git a/new-lamassu-admin/src/pages/ServerLogs.jsx b/new-lamassu-admin/src/pages/ServerLogs.jsx
index b66f3ec6..136784b6 100644
--- a/new-lamassu-admin/src/pages/ServerLogs.jsx
+++ b/new-lamassu-admin/src/pages/ServerLogs.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState, useRef } from 'react'
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
diff --git a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
index 80f1e4ce..599eb8e5 100644
--- a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
+++ b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Grid } from '@material-ui/core'
+import Grid from '@mui/material/Grid'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Formik, Form, FastField } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Services/Services.jsx b/new-lamassu-admin/src/pages/Services/Services.jsx
index fdbf2234..22b44c92 100644
--- a/new-lamassu-admin/src/pages/Services/Services.jsx
+++ b/new-lamassu-admin/src/pages/Services/Services.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Grid } from '@material-ui/core'
+import Grid from '@mui/material/Grid'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js
index c440e60d..07c2705b 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js
@@ -144,6 +144,6 @@ export default {
environment: Yup.string('The environment must be a string')
.matches(/(prod|test)/)
.required('The environment is required')
- })
+ });
}
}
diff --git a/new-lamassu-admin/src/pages/Services/schemas/galoy.js b/new-lamassu-admin/src/pages/Services/schemas/galoy.js
index 1ecedbfb..d98a07f4 100644
--- a/new-lamassu-admin/src/pages/Services/schemas/galoy.js
+++ b/new-lamassu-admin/src/pages/Services/schemas/galoy.js
@@ -57,6 +57,6 @@ export default {
endpoint: Yup.string('The endpoint must be a string')
.max(100, 'The endpoint is too long')
.required('The endpoint is required')
- })
+ });
}
}
diff --git a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx
index 671eb3ad..a9fb8d23 100644
--- a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx
+++ b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx
@@ -98,7 +98,8 @@ const SessionManagement = () => {
{
deleteSession({ variables: { sid: s.sid } })
- }}>
+ }}
+ size="large">
)
diff --git a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
index 32ccb5b5..306111f5 100644
--- a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
+++ b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
@@ -71,7 +71,7 @@ const CopyToClipboard = ({
)}
- )
+ );
}
export default CopyToClipboard
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
index 805ca6b9..f4d87525 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
@@ -1,6 +1,7 @@
import { useLazyQuery, useMutation, gql } from "@apollo/client";
import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
-import { makeStyles, Box } from '@material-ui/core'
+import Box from '@mui/material/Box'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import classNames from 'classnames'
import { add, differenceInYears, format, sub, parse } from 'date-fns/fp'
diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx
index 49bbf39e..2cec7eb3 100644
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx
@@ -1,6 +1,6 @@
import { useQuery, gql } from "@apollo/client";
import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import * as R from 'ramda'
import React, { useEffect, useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx
index c21291be..b9c224dc 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx
@@ -1,5 +1,5 @@
import { useMutation, useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
@@ -178,121 +178,118 @@ const CustomInfoRequests = ({
)
- return (
- !configLoading && (
- <>
- {customRequests.length > 0 && (
- it.customRequest.name
- },
- {
- header: 'Data entry type',
- width: 300,
- textAlign: 'left',
- size: 'sm',
- view: it => inputTypeDisplay[it.customRequest.input.type]
- },
- {
- header: 'Constraints',
- width: 300,
- textAlign: 'left',
- size: 'sm',
- view: it =>
- constraintTypeDisplay[it.customRequest.input.constraintType]
- },
- {
- header: 'Edit',
- width: 100,
- textAlign: 'center',
- size: 'sm',
- view: it => {
- return (
- {
- setToBeEdited(it)
- return toggleWizard()
- }}>
-
-
- )
- }
- },
- {
- header: 'Delete',
- width: 100,
- textAlign: 'center',
- size: 'sm',
- view: it => {
- return (
- {
- setToBeDeleted(it.id)
- return setDeleteDialog(true)
- }}>
-
-
- )
- }
- }
- ]}
- data={customRequests}
- Details={DetailsRow}
- expandable
- rowSize="sm"
- />
- )}
- {!customRequests.length && (
-
-
- It seems you haven't added any custom information requests yet.
-
-
- Please read our{' '}
-
- Support Article
- {' '}
- on Compliance before adding new information requests.
-
-
-
+
+ It seems you haven't added any custom information requests yet.
+
+
+ Please read our{' '}
+
+ Support Article
+ {' '}
+ on Compliance before adding new information requests.
+
+
+
+ )}
+ {showWizard && (
+ {
+ setToBeEdited(null)
+ setHasError(false)
+ toggleWizard()
+ }}
+ toBeEdited={toBeEdited}
+ onSave={(...args) => handleSave(...args)}
+ existingRequirements={customRequests}
+ />
+ )}
+ {
+ setDeleteDialog(false)
+ setHasError(false)
+ }}
+ item={`custom information request`}
+ extraMessage={detailedDeleteMsg}
+ onConfirmed={() => handleDelete(toBeDeleted)}
+ />
+ ));
}
export default CustomInfoRequests
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
index 9d056395..2de4ac04 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import { Label1, Info2 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx
index 91f66b19..a171c1dd 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Field, useFormikContext, FieldArray } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx
index 49985224..5c6c364d 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Field, useFormikContext } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx
index f5baec02..79f2674e 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Field, useFormikContext } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx
index e4d75857..232902b2 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx
index 17352b54..b3d9ffa0 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H1, P } from 'src/components/typography'
import CustomReqLogo from 'src/styling/icons/compliance/custom-requirement.svg?react'
diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
index 1af0c181..b98396d6 100644
--- a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
@@ -1,5 +1,6 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles, Box } from '@material-ui/core'
+import Box from '@mui/material/Box'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { H2 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Triggers/Triggers.jsx b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
index 6039aa4e..1043caa1 100644
--- a/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
@@ -1,5 +1,7 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Box } from '@material-ui/core'
+import Box from '@mui/material/Box'
+import Switch from '@mui/material/Switch'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
@@ -14,7 +16,6 @@ import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white
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 { fromNamespace, toNamespace } from 'src/utils/config'
diff --git a/new-lamassu-admin/src/pages/Triggers/Wizard.jsx b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx
index 4b0b0002..abf8d94a 100644
--- a/new-lamassu-admin/src/pages/Triggers/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import { Form, Formik, useFormikContext } from 'formik'
import * as R from 'ramda'
import React, { useState, Fragment, useEffect } from 'react'
diff --git a/new-lamassu-admin/src/pages/Triggers/components/helper.js b/new-lamassu-admin/src/pages/Triggers/components/helper.js
index f1ab47b3..70ab864f 100644
--- a/new-lamassu-admin/src/pages/Triggers/components/helper.js
+++ b/new-lamassu-admin/src/pages/Triggers/components/helper.js
@@ -63,7 +63,7 @@ const getOverridesSchema = (values, customInfoRequests) => {
.label('Automation')
.matches(/(Manual|Automatic)/)
.required()
- })
+ });
}
const getDefaultSettings = () => {
diff --git a/new-lamassu-admin/src/pages/Triggers/helper.jsx b/new-lamassu-admin/src/pages/Triggers/helper.jsx
index a0e613ee..353a7c41 100644
--- a/new-lamassu-admin/src/pages/Triggers/helper.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/helper.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Box } from '@material-ui/core'
+import Box from '@mui/material/Box'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Field, useFormikContext } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
index 0bf36870..271ccba7 100644
--- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
@@ -1,5 +1,8 @@
import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles, Box, Chip } from '@material-ui/core'
+import Chip from '@mui/material/Chip'
+import Box from '@mui/material/Box'
+import Switch from '@mui/material/Switch'
+import { makeStyles } from '@mui/styles'
import { startAttestation } from '@simplewebauthn/browser'
import * as R from 'ramda'
import React, { useReducer, useState, useContext } from 'react'
@@ -14,7 +17,6 @@ import UserRoleIcon from 'src/styling/icons/button/user-role/zodiac.svg?react'
import AppContext from 'src/AppContext'
import { ActionButton, Link } from 'src/components/buttons'
-import { Switch } from 'src/components/inputs'
import { IP_CHECK_REGEX } from 'src/utils/constants'
import styles from './UserManagement.styles'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx
index 9254b6a1..eb7b7cbe 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import React, { useState } from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx
index 729fcb14..b3704f68 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Field, Form, Formik } from 'formik'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx
index b5f62c9b..0066e184 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import React, { useState } from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx
index 1580abb0..8762a783 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import Modal from 'src/components/Modal'
import { Info2, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx
index 112356fe..73666fa7 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx
@@ -1,5 +1,5 @@
import { useLazyQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import { Form, Formik } from 'formik'
import React, { useState } from 'react'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx
index 7add5e02..ae1cfc49 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import React, { useEffect, useState } from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx
index ae9f209a..ca53e015 100644
--- a/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@mui/styles'
import React, { useEffect, useState } from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.jsx b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx
index 6e3986ce..32915acc 100644
--- a/new-lamassu-admin/src/pages/Wallet/Wallet.jsx
+++ b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx
index cae7a4e2..ed44939b 100644
--- a/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx
+++ b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H1, P } from 'src/components/typography'
import BitcoinLogo from 'src/styling/logos/icon-bitcoin-colour.svg?react'
diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx
index 3070b1f4..0443665a 100644
--- a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx
+++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Formik, Form, Field } from 'formik'
import * as R from 'ramda'
@@ -165,7 +165,7 @@ const WizardStep = ({
fullWidth
label={`Select ${displayName}`}
className={classes.picker}
- getOptionSelected={R.eqProps('code')}
+ isOptionEqualToValue={R.eqProps('code')}
labelProp={'display'}
options={unfilled}
onChange={(evt, it) => {
@@ -194,7 +194,7 @@ const WizardStep = ({
)}
- )
+ );
}
export default WizardStep
diff --git a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
index 00e2b954..81087696 100644
--- a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
@@ -1,5 +1,7 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles, Dialog, DialogContent } from '@material-ui/core'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { useState, useContext } from 'react'
import { useHistory } from 'react-router-dom'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx b/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx
index f61e8a9d..f82c4ed4 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React from 'react'
import Section from 'src/components/layout/Section'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
index 41a88813..6a0c005c 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
@@ -1,4 +1,6 @@
-import { makeStyles, Drawer, Grid } from '@material-ui/core'
+import Drawer from '@mui/material/Drawer'
+import Grid from '@mui/material/Grid'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { useState } from 'react'
import Modal from 'src/components/Modal'
@@ -52,13 +54,13 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) {
variant={'persistent'}
classes={{ paperAnchorDockedBottom: classes.drawer }}>
- )
+ );
}
export default Footer
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx b/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx
index 37d39166..e35b83f4 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React from 'react'
import Section from 'src/components/layout/Section'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx
index e26a8473..fc07996d 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx
@@ -1,5 +1,5 @@
import { useMutation, useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React, { useState, useEffect } from 'react'
import { H4, Info3 } from 'src/components/typography'
import FormRenderer from 'src/pages/Services/FormRenderer'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx
index 7454fd21..6506312c 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx
@@ -1,5 +1,5 @@
-import { makeStyles } from '@material-ui/core'
-import Grid from '@material-ui/core/Grid'
+import { makeStyles } from '@mui/styles'
+import Grid from '@mui/material/Grid'
import React, { useState } from 'react'
import Sidebar from 'src/components/layout/Sidebar'
import TitleSection from 'src/components/layout/TitleSection'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx b/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx
index 7948bb98..9b59072b 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React from 'react'
// import OperatorInfo from 'src/pages/OperatorInfo'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
index 972f091f..78bef57b 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
@@ -1,5 +1,6 @@
import { useMutation, useQuery, gql } from "@apollo/client";
-import { makeStyles, Box } from '@material-ui/core'
+import Box from '@mui/material/Box'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { useState } from 'react'
import InfoMessage from 'src/components/InfoMessage'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx
index 9d66c75a..fd5ca065 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { P, H4 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx
index f3247ba3..a5d2605f 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx
@@ -1,5 +1,5 @@
import { useMutation, useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React, { useState } from 'react'
import { P, H4 } from 'src/components/typography'
import FormRenderer from 'src/pages/Services/FormRenderer'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx
index 18bbd6c2..0216bed3 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import { Formik, Form, Field } from 'formik'
import React, { useState } from 'react'
import PromptWhenDirty from 'src/components/PromptWhenDirty'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx
index 8618cb28..cb117b79 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx
@@ -1,6 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
import { getEquivalentCode } from '@lamassu/coins/lightUtils'
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { H4, Info3 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx
index e9c0154a..89e9d646 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx
@@ -1,6 +1,6 @@
import { useQuery, gql } from "@apollo/client";
import { getEquivalentCode } from '@lamassu/coins/lightUtils'
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { H4 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx
index ac0bb812..64c6d0d7 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { H4, Info3 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx
index b55ecf15..337bb4e7 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import Sidebar, { Stepper } from 'src/components/layout/Sidebar'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx b/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx
index ebe87a41..221fe2a9 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H1, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/routing/routes.jsx b/new-lamassu-admin/src/routing/routes.jsx
index 26afcbe7..47d623d6 100644
--- a/new-lamassu-admin/src/routing/routes.jsx
+++ b/new-lamassu-admin/src/routing/routes.jsx
@@ -1,6 +1,6 @@
-import Fade from '@material-ui/core/Fade'
-import Slide from '@material-ui/core/Slide'
-import { makeStyles } from '@material-ui/core/styles'
+import Fade from '@mui/material/Fade'
+import Slide from '@mui/material/Slide'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useContext } from 'react'
import {
diff --git a/new-lamassu-admin/src/styling/theme.js b/new-lamassu-admin/src/styling/theme.js
index 7567131e..83346419 100644
--- a/new-lamassu-admin/src/styling/theme.js
+++ b/new-lamassu-admin/src/styling/theme.js
@@ -1,4 +1,4 @@
-import { createTheme } from '@material-ui/core/styles'
+import { createTheme } from '@mui/material/styles';
import typographyStyles from 'src/components/typography/styles'
@@ -13,18 +13,14 @@ import {
fontSize5,
zircon,
zircon2,
- primaryColor
+ primaryColor, disabledColor2, disabledColor
} from './variables'
const { p } = typographyStyles
-export default createTheme({
+let theme = createTheme({
typography: {
fontFamily: inputFontFamily,
- body1: { ...p }
- },
- MuiButtonBase: {
- disableRipple: true
},
palette: {
primary: {
@@ -41,105 +37,195 @@ export default createTheme({
default: backgroundColor
}
},
- overrides: {
- MuiRadio: {
- colorSecondary: {
- color: secondaryColor
+})
+
+theme = createTheme(theme, {
+ components: {
+ MuiTypography: {
+ styleOverrides: {
+ root: { ...p },
+ body1: { ...p },
+ }
+ },
+ MuiButtonBase: {
+ defaultProps: {
+ disableRipple: true
+ }
+ },
+ MuiSwitch: {
+ styleOverrides: {
+ root: {
+ width: 32,
+ height: 20,
+ padding: 0,
+ margin: theme.spacing(1)
+ },
+ thumb: {
+ width: 16,
+ height: 16
+ },
+ track: {
+ borderRadius: 17,
+ border: 'none',
+ backgroundColor: offColor,
+ opacity: 1,
+ transition: theme.transitions.create(['background-color', 'border'])
+ },
+ switchBase: {
+ padding: 2,
+ '&.Mui-disabled': {
+ color: disabledColor2,
+ '& + .MuiSwitch-track': {
+ backgroundColor: disabledColor,
+ opacity: 1
+ }
+ },
+ '&.Mui-checked': {
+ transform: 'translateX(58%)',
+ color: theme.palette.common.white,
+ '&.Mui-disabled': {
+ color: disabledColor2
+ },
+ '& + .MuiSwitch-track': {
+ backgroundColor: secondaryColor,
+ opacity: 1,
+ border: 'none'
+ }
+ },
+ '&.Mui-focusVisible .MuiSwitch-thumb': {
+ border: '6px solid #fff',
+ boxShadow: '0 0 4px 0 rgba(0,0,0,0.24)'
+ }
+ }
+ }
+ },
+ MuiMenuItem: {
+ styleOverrides: {
+ root: {
+ '&:hover': {
+ backgroundColor: subheaderColor
+ },
+ '&.Mui-selected': {
+ '&:hover': {
+ backgroundColor: subheaderColor
+ },
+ backgroundColor: subheaderColor
+ }
+ }
}
},
MuiAutocomplete: {
- root: {
- color: fontColor
- },
- noOptions: {
- padding: [[6, 16]]
- },
- option: {
- '&[data-focus="true"]': {
- backgroundColor: subheaderColor
- }
- },
- paper: {
- color: fontColor,
- margin: 0
- },
- listbox: {
- padding: 0
- },
- tag: {
- '&[data-tag-index="0"]': {
- marginLeft: 0
+ styleOverrides: {
+ root: {
+ color: fontColor
},
- margin: 2,
- backgroundColor: subheaderColor,
- borderRadius: 4,
- height: 18
+ noOptions: {
+ padding: `6px 16px`
+ },
+ option: {
+ '&.Mui-focused': {
+ backgroundColor: subheaderColor
+ },
+ '&[aria-selected="true"]': {
+ backgroundColor: `${subheaderColor} !important`
+ },
+ },
+ paper: {
+ color: fontColor,
+ margin: 0
+ },
+ listbox: {
+ padding: 0
+ },
+ tag: {
+ '&[data-tag-index="0"]': {
+ marginLeft: 0
+ },
+ margin: 2,
+ backgroundColor: subheaderColor,
+ borderRadius: 4,
+ height: 18
+ }
}
},
MuiChip: {
- label: {
- paddingLeft: 4,
- paddingRight: 4,
- color: fontColor,
- fontSize: fontSize5
+ styleOverrides: {
+ label: {
+ paddingLeft: 4,
+ paddingRight: 4,
+ color: fontColor,
+ fontSize: fontSize5
+ }
}
},
MuiInput: {
- root: {
- color: fontColor
- },
- underline: {
- '&:before': {
- borderBottom: [[2, 'solid', fontColor]]
+ styleOverrides: {
+ root: {
+ color: fontColor
+ },
+ underline: {
+ '&:before': {
+ borderBottom: `2px solid ${fontColor}`
+ }
}
}
},
MuiInputLabel: {
- root: {
- font: 'inherit',
- fontSize: fontSize3,
- color: offColor
- },
- shrink: {
- color: fontColor,
- transform: 'translate(0, 1.7px) scale(0.83)'
+ styleOverrides: {
+ root: {
+ font: 'inherit',
+ fontSize: fontSize3,
+ color: offColor
+ },
+ shrink: {
+ color: fontColor,
+ transform: 'translate(0, 1.7px) scale(0.83)'
+ }
}
},
MuiFormLabel: {
- root: {
- '&$focused': {
- color: fontColor
+ styleOverrides: {
+ root: {
+ '&.Mui-focused': {
+ color: fontColor
+ }
}
}
},
MuiListItem: {
- root: {
- '&:nth-of-type(odd)': {
- backgroundColor: backgroundColor
+ styleOverrides: {
+ root: {
+ '&:nth-of-type(odd)': {
+ backgroundColor: backgroundColor
+ }
}
}
},
MuiToggleButton: {
- root: {
- '&$selected': {
- backgroundColor: zircon,
- borderColor: primaryColor,
- borderTopColor: [primaryColor, '!important'],
+ styleOverrides: {
+ root: {
+ '&.Mui-selected': {
+ backgroundColor: zircon,
+ borderColor: primaryColor,
+ borderTopColor: `${primaryColor} !important`,
+ '&:hover': {
+ backgroundColor: zircon2
+ }
+ },
'&:hover': {
backgroundColor: zircon2
}
- },
- '&:hover': {
- backgroundColor: zircon2
}
}
},
MuiToggleButtonGroup: {
- groupedVertical: {
- borderRadius: 8,
- border: '1px solid',
- borderColor: zircon,
- '&:not(:first-child)': {
+ styleOverrides: {
+ vertical: {
+ borderRadius: 8,
+ border: 'none',
+ borderColor: zircon,
+ },
+ firstButton: {
borderTop: '1px solid',
borderTopColor: zircon,
borderTopRightRadius: 8,
@@ -147,15 +233,25 @@ export default createTheme({
borderBottomRightRadius: 8,
borderBottomLeftRadius: 8
},
- '&:not(:last-child)': {
+ lastButton: {
borderTop: '1px solid',
borderTopColor: zircon,
borderTopRightRadius: 8,
borderTopLeftRadius: 8,
borderBottomRightRadius: 8,
borderBottomLeftRadius: 8
- }
+ },
+ middleButton: {
+ borderTop: '1px solid',
+ borderTopColor: zircon,
+ borderTopRightRadius: 8,
+ borderTopLeftRadius: 8,
+ borderBottomRightRadius: 8,
+ borderBottomLeftRadius: 8
+ },
}
}
}
})
+
+export default theme
\ No newline at end of file