diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json
index c2cbde59..15e9f98c 100644
--- a/new-lamassu-admin/package-lock.json
+++ b/new-lamassu-admin/package-lock.json
@@ -13,9 +13,6 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@lamassu/coins": "v1.6.1",
- "@material-ui/core": "4.12.4",
- "@material-ui/icons": "4.11.2",
- "@material-ui/lab": "^4.0.0-alpha.61",
"@mui/icons-material": "^5.17.1",
"@mui/lab": "^5.0.0-alpha.170",
"@mui/material": "^5.17.1",
@@ -534,7 +531,8 @@
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/@emotion/is-prop-valid": {
"version": "1.3.1",
@@ -1453,6 +1451,7 @@
"integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==",
"deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/runtime": "^7.4.4",
"@material-ui/styles": "^4.11.5",
@@ -1491,6 +1490,7 @@
"integrity": "sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==",
"deprecated": "You can now upgrade to @mui/icons. See the guide: https://mui.com/guides/migration-v4/",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/runtime": "^7.4.4"
},
@@ -1509,40 +1509,13 @@
}
}
},
- "node_modules/@material-ui/lab": {
- "version": "4.0.0-alpha.61",
- "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz",
- "integrity": "sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg==",
- "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.4.4",
- "@material-ui/utils": "^4.11.3",
- "clsx": "^1.0.4",
- "prop-types": "^15.7.2",
- "react-is": "^16.8.0 || ^17.0.0"
- },
- "engines": {
- "node": ">=8.0.0"
- },
- "peerDependencies": {
- "@material-ui/core": "^4.12.1",
- "@types/react": "^16.8.6 || ^17.0.0",
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
"node_modules/@material-ui/styles": {
"version": "4.11.5",
"resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz",
"integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==",
"deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/runtime": "^7.4.4",
"@emotion/hash": "^0.8.0",
@@ -1584,6 +1557,7 @@
"resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz",
"integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/runtime": "^7.4.4",
"@material-ui/utils": "^4.11.3",
@@ -1613,6 +1587,7 @@
"resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
"integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==",
"license": "MIT",
+ "peer": true,
"peerDependencies": {
"@types/react": "*"
},
@@ -1627,6 +1602,7 @@
"resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz",
"integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/runtime": "^7.4.4",
"prop-types": "^15.7.2",
@@ -4034,7 +4010,8 @@
"version": "2.6.21",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
"integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/d3": {
"version": "6.7.0",
@@ -7483,7 +7460,8 @@
"version": "1.16.1-lts",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
"integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/possible-typed-array-names": {
"version": "1.1.0",
@@ -7713,7 +7691,8 @@
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/react-lifecycles-compat": {
"version": "3.0.4",
diff --git a/new-lamassu-admin/src/App.jsx b/new-lamassu-admin/src/App.jsx
index b17facf0..1fd11d2b 100644
--- a/new-lamassu-admin/src/App.jsx
+++ b/new-lamassu-admin/src/App.jsx
@@ -2,13 +2,8 @@ import { useQuery, gql } from "@apollo/client";
import CssBaseline from '@mui/material/CssBaseline'
import Grid from '@mui/material/Grid'
import Slide from '@mui/material/Slide'
-import {
- StylesProvider,
- jssPreset,
- MuiThemeProvider,
- StyledEngineProvider,
- makeStyles,
-} from '@mui/material/styles';
+import { StylesProvider, jssPreset, makeStyles } from '@mui/styles';
+import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
import { create } from 'jss'
import extendJss from 'jss-plugin-extend'
import React, { useContext, useState } from 'react'
@@ -155,10 +150,10 @@ const App = () => {
-
+
-
+
diff --git a/new-lamassu-admin/src/components/Carousel.jsx b/new-lamassu-admin/src/components/Carousel.jsx
index 56bb29f4..6b610a6c 100644
--- a/new-lamassu-admin/src/components/Carousel.jsx
+++ b/new-lamassu-admin/src/components/Carousel.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { memo } from 'react'
import ReactCarousel from 'react-material-ui-carousel'
import LeftArrow from 'src/styling/icons/arrow/carousel-left-arrow.svg?react'
diff --git a/new-lamassu-admin/src/components/Chip.jsx b/new-lamassu-admin/src/components/Chip.jsx
index 59735668..6358047d 100644
--- a/new-lamassu-admin/src/components/Chip.jsx
+++ b/new-lamassu-admin/src/components/Chip.jsx
@@ -1,5 +1,5 @@
import Chip from '@mui/material/Chip'
-import { withStyles } from '@mui/material/styles'
+import { withStyles } from '@mui/styles'
import React, { memo } from 'react'
import {
diff --git a/new-lamassu-admin/src/components/CollapsibleCard.jsx b/new-lamassu-admin/src/components/CollapsibleCard.jsx
index e360a87e..eeec8527 100644
--- a/new-lamassu-admin/src/components/CollapsibleCard.jsx
+++ b/new-lamassu-admin/src/components/CollapsibleCard.jsx
@@ -1,5 +1,5 @@
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import PropTypes from 'prop-types'
import React from 'react'
diff --git a/new-lamassu-admin/src/components/ConfirmDialog.jsx b/new-lamassu-admin/src/components/ConfirmDialog.jsx
index b692ef83..b7d9b893 100644
--- a/new-lamassu-admin/src/components/ConfirmDialog.jsx
+++ b/new-lamassu-admin/src/components/ConfirmDialog.jsx
@@ -2,9 +2,9 @@ import {
Dialog,
DialogActions,
DialogContent,
- makeStyles,
InputLabel
} from '@mui/material'
+import { makeStyles } from '@mui/styles'
import React, { memo, useState } from 'react'
import { H4, P } from 'src/components/typography'
import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
diff --git a/new-lamassu-admin/src/components/DeleteDialog.jsx b/new-lamassu-admin/src/components/DeleteDialog.jsx
index 1cfd2a87..1e334725 100644
--- a/new-lamassu-admin/src/components/DeleteDialog.jsx
+++ b/new-lamassu-admin/src/components/DeleteDialog.jsx
@@ -2,8 +2,8 @@ import {
Dialog,
DialogActions,
DialogContent,
- makeStyles
} from '@mui/material'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H4, P } from 'src/components/typography'
import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
diff --git a/new-lamassu-admin/src/components/ErrorMessage.jsx b/new-lamassu-admin/src/components/ErrorMessage.jsx
index 5df8af7d..e5ff4efc 100644
--- a/new-lamassu-admin/src/components/ErrorMessage.jsx
+++ b/new-lamassu-admin/src/components/ErrorMessage.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import ErrorIcon from 'src/styling/icons/warning-icon/tomato.svg?react'
diff --git a/new-lamassu-admin/src/components/ImagePopper.jsx b/new-lamassu-admin/src/components/ImagePopper.jsx
index 44aec2c9..1aa2be09 100644
--- a/new-lamassu-admin/src/components/ImagePopper.jsx
+++ b/new-lamassu-admin/src/components/ImagePopper.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, ClickAwayListener } from '@mui/material'
+import { ClickAwayListener } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo, useState } from 'react'
import Popper from 'src/components/Popper'
diff --git a/new-lamassu-admin/src/components/InfoMessage.jsx b/new-lamassu-admin/src/components/InfoMessage.jsx
index a91bfe3f..1e701d4d 100644
--- a/new-lamassu-admin/src/components/InfoMessage.jsx
+++ b/new-lamassu-admin/src/components/InfoMessage.jsx
@@ -1,4 +1,5 @@
-import { Box, makeStyles } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { Label1 } from 'src/components/typography'
import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react'
diff --git a/new-lamassu-admin/src/components/InformativeDialog.jsx b/new-lamassu-admin/src/components/InformativeDialog.jsx
index 15df9448..149984bf 100644
--- a/new-lamassu-admin/src/components/InformativeDialog.jsx
+++ b/new-lamassu-admin/src/components/InformativeDialog.jsx
@@ -1,4 +1,5 @@
-import { Dialog, DialogContent, makeStyles } from '@mui/material'
+import { Dialog, DialogContent } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import React, { memo } from 'react'
import { H1 } from 'src/components/typography'
import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react'
diff --git a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
index 64b1261e..c4914fde 100644
--- a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
+++ b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
@@ -1,5 +1,6 @@
import { useLazyQuery } from "@apollo/client";
-import { makeStyles, ClickAwayListener } from '@mui/material'
+import { ClickAwayListener } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { format, set } from 'date-fns/fp'
import FileSaver from 'file-saver'
diff --git a/new-lamassu-admin/src/components/Modal.jsx b/new-lamassu-admin/src/components/Modal.jsx
index 47d43105..062b8425 100644
--- a/new-lamassu-admin/src/components/Modal.jsx
+++ b/new-lamassu-admin/src/components/Modal.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Modal as MaterialModal, Paper } from '@mui/material'
+import { Modal as MaterialModal, Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import { H1, H4 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx
index ab64af73..f0eef5d5 100644
--- a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx
+++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
import ActionButton from 'src/components/buttons/ActionButton'
diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx
index 1d5bd06c..5b5de598 100644
--- a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx
+++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import prettyMs from 'pretty-ms'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/components/Popper.jsx b/new-lamassu-admin/src/components/Popper.jsx
index e751a0be..6dc56d01 100644
--- a/new-lamassu-admin/src/components/Popper.jsx
+++ b/new-lamassu-admin/src/components/Popper.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Popper as MaterialPopper, Paper } from '@mui/material'
+import { Popper as MaterialPopper, Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/components/SearchBox.jsx b/new-lamassu-admin/src/components/SearchBox.jsx
index df7a1d0d..7ddbb1ac 100644
--- a/new-lamassu-admin/src/components/SearchBox.jsx
+++ b/new-lamassu-admin/src/components/SearchBox.jsx
@@ -1,7 +1,7 @@
import InputBase from '@mui/material/InputBase'
import Paper from '@mui/material/Paper'
-import { makeStyles } from '@mui/material/styles'
-import MAutocomplete from '@mui/lab/Autocomplete'
+import { makeStyles } from '@mui/styles'
+import MAutocomplete from '@mui/material/Autocomplete'
import classnames from 'classnames'
import React, { memo, useState } from 'react'
import { P } from 'src/components/typography'
@@ -39,11 +39,13 @@ const SearchBox = memo(
value={filters}
options={options}
getOptionLabel={it => it.label || it.value}
- renderOption={it => (
-
-
{it.label || it.value}
-
{it.type}
-
+
{it.label || it.value}
+
{it.type}
+
{props.warningMessage}
-
-
+
+
+ {R.path([labelProp])(props)}
+
+ {props.warningMessage}
+
+
+
)
}}
/>
diff --git a/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx
index 8743782a..cd097e1f 100644
--- a/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx
@@ -1,5 +1,5 @@
import Checkbox from '@mui/material/Checkbox'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import CheckBoxIcon from '@mui/icons-material/CheckBox'
import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank'
import React from 'react'
@@ -16,7 +16,7 @@ import {
const useStyles = makeStyles({
root: {
color: secondaryColor,
- '&$checked': {
+ '&.Mui-checked': {
color: secondaryColor
}
},
diff --git a/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx b/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx
index 0aaa2130..dd238952 100644
--- a/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import OtpInput from 'react-otp-input'
diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
index 18ba493f..2f680f87 100644
--- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
@@ -1,9 +1,9 @@
import {
Radio,
RadioGroup as MRadioGroup,
- FormControlLabel,
- makeStyles
+ FormControlLabel
} from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import { Label1 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/inputs/base/Select.jsx b/new-lamassu-admin/src/components/inputs/base/Select.jsx
index 329632ef..c79839b3 100644
--- a/new-lamassu-admin/src/components/inputs/base/Select.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/Select.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { useSelect } from 'downshift'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/components/inputs/base/Switch.jsx b/new-lamassu-admin/src/components/inputs/base/Switch.jsx
index 8aa1f3c6..fedd6b44 100644
--- a/new-lamassu-admin/src/components/inputs/base/Switch.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/Switch.jsx
@@ -1,5 +1,5 @@
import Switch from '@mui/material/Switch'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { memo } from 'react'
import {
@@ -18,17 +18,17 @@ const useStyles = makeStyles(theme => ({
},
switchBase: {
padding: 2,
- '&$disabled': {
+ '&.Mui-disabled': {
color: disabledColor2,
'& + $track': {
backgroundColor: disabledColor,
opacity: 1
}
},
- '&$checked': {
+ '&.Mui-checked': {
transform: 'translateX(58%)',
color: theme.palette.common.white,
- '&$disabled': {
+ '&.Mui-disabled': {
color: disabledColor2
},
'& + $track': {
@@ -37,7 +37,7 @@ const useStyles = makeStyles(theme => ({
border: 'none'
}
},
- '&$focusVisible $thumb': {
+ '&.Mui-focusVisible $thumb': {
border: '6px solid #fff',
boxShadow: '0 0 4px 0 rgba(0,0,0,0.24)'
}
diff --git a/new-lamassu-admin/src/components/inputs/base/TextInput.jsx b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx
index d6426aae..33ba68ac 100644
--- a/new-lamassu-admin/src/components/inputs/base/TextInput.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import TextField from '@mui/material/TextField'
import classnames from 'classnames'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
index 424770e4..c63908ea 100644
--- a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { ToggleButtonGroup as MUIToggleButtonGroup } from '@mui/lab'
import ToggleButton from '@mui/lab/ToggleButton'
import React from 'react'
diff --git a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx
index 097f0636..81d90e83 100644
--- a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx
+++ b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import Chip from 'src/components/Chip'
diff --git a/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx b/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx
index 34a1c919..14f4141a 100644
--- a/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx
+++ b/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classNames from 'classnames'
import React, { memo, useState } from 'react'
import { CashOut } from 'src/components/inputs/cashbox/Cashbox'
diff --git a/new-lamassu-admin/src/components/layout/Header.jsx b/new-lamassu-admin/src/components/layout/Header.jsx
index fdbf12e2..0e270ce2 100644
--- a/new-lamassu-admin/src/components/layout/Header.jsx
+++ b/new-lamassu-admin/src/components/layout/Header.jsx
@@ -1,7 +1,7 @@
import { useQuery, gql } from "@apollo/client";
import ClickAwayListener from '@mui/material/ClickAwayListener'
import Popper from '@mui/material/Popper'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { memo, useState, useEffect, useRef } from 'react'
diff --git a/new-lamassu-admin/src/components/layout/Section.jsx b/new-lamassu-admin/src/components/layout/Section.jsx
index 538ec028..b40f991f 100644
--- a/new-lamassu-admin/src/components/layout/Section.jsx
+++ b/new-lamassu-admin/src/components/layout/Section.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
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.jsx b/new-lamassu-admin/src/components/layout/Sidebar.jsx
index 055049cc..27d48f9d 100644
--- a/new-lamassu-admin/src/components/layout/Sidebar.jsx
+++ b/new-lamassu-admin/src/components/layout/Sidebar.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import { P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/layout/TitleSection.jsx b/new-lamassu-admin/src/components/layout/TitleSection.jsx
index 67407f86..49755be6 100644
--- a/new-lamassu-admin/src/components/layout/TitleSection.jsx
+++ b/new-lamassu-admin/src/components/layout/TitleSection.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx b/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx
index 92b0942d..e49a619d 100644
--- a/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx
+++ b/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx
@@ -1,5 +1,5 @@
import { useLazyQuery, useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { subMinutes } from 'date-fns'
import FileSaver from 'file-saver'
import React, { useState, useEffect } from 'react'
diff --git a/new-lamassu-admin/src/components/machineActions/MachineActions.jsx b/new-lamassu-admin/src/components/machineActions/MachineActions.jsx
index df0dcb9f..ad040372 100644
--- a/new-lamassu-admin/src/components/machineActions/MachineActions.jsx
+++ b/new-lamassu-admin/src/components/machineActions/MachineActions.jsx
@@ -1,5 +1,5 @@
import { useMutation, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { memo, useState } from 'react'
import { ConfirmDialog } from 'src/components/ConfirmDialog'
import ActionButton from 'src/components/buttons/ActionButton'
diff --git a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx
index ec9dd9b9..9673b34f 100644
--- a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx
+++ b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import {
diff --git a/new-lamassu-admin/src/components/table/EmptyTable.jsx b/new-lamassu-admin/src/components/table/EmptyTable.jsx
index 00443524..651cccd5 100644
--- a/new-lamassu-admin/src/components/table/EmptyTable.jsx
+++ b/new-lamassu-admin/src/components/table/EmptyTable.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classNames from 'classnames'
import React, { memo } from 'react'
import { H4 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/table/Table.jsx b/new-lamassu-admin/src/components/table/Table.jsx
index f46436d0..89737113 100644
--- a/new-lamassu-admin/src/components/table/Table.jsx
+++ b/new-lamassu-admin/src/components/table/Table.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/components/table/TableCell.jsx b/new-lamassu-admin/src/components/table/TableCell.jsx
index d42b3eae..8d3656a3 100644
--- a/new-lamassu-admin/src/components/table/TableCell.jsx
+++ b/new-lamassu-admin/src/components/table/TableCell.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/components/table/TableHeader.jsx b/new-lamassu-admin/src/components/table/TableHeader.jsx
index bcdd1d89..f1aef29a 100644
--- a/new-lamassu-admin/src/components/table/TableHeader.jsx
+++ b/new-lamassu-admin/src/components/table/TableHeader.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/components/table/TableRow.jsx b/new-lamassu-admin/src/components/table/TableRow.jsx
index 32f23ad2..0b901e90 100644
--- a/new-lamassu-admin/src/components/table/TableRow.jsx
+++ b/new-lamassu-admin/src/components/table/TableRow.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/components/tables/DataTable.jsx b/new-lamassu-admin/src/components/tables/DataTable.jsx
index f900b4eb..c31d0a29 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.jsx
+++ b/new-lamassu-admin/src/components/tables/DataTable.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
diff --git a/new-lamassu-admin/src/components/typography/index.jsx b/new-lamassu-admin/src/components/typography/index.jsx
index 37a38a11..fe53c529 100644
--- a/new-lamassu-admin/src/components/typography/index.jsx
+++ b/new-lamassu-admin/src/components/typography/index.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx
index 9e78eefb..9d88ec43 100644
--- a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx
+++ b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx
@@ -1,6 +1,6 @@
import { useMutation, useQuery, gql } from "@apollo/client";
import { Dialog, DialogContent, SvgIcon, IconButton } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Form, Formik, FastField } from 'formik'
import {QRCodeSVG as QRCode} from 'qrcode.react'
diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx
index 0b717ce9..9437df1a 100644
--- a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx
@@ -1,6 +1,6 @@
import { useQuery, gql } from "@apollo/client";
import { Box } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { endOfToday } from 'date-fns'
import { subDays, format, add, startOfWeek } from 'date-fns/fp'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx b/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx
index a0d419d3..c6d2a4a4 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx
index 86c3b2f4..005543d8 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx
@@ -1,5 +1,5 @@
import { Paper } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo } from 'react'
import { Info2, Label3, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx
index 7259220e..f0a58968 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx
@@ -1,5 +1,5 @@
import { Box } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { getTimezoneOffset } from 'date-fns-tz'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx
index e781f5a6..e4a64516 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx
@@ -1,5 +1,5 @@
import { Box } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { useState } from 'react'
import { H2 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx
index da72bb23..e6eb81d3 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx
@@ -1,5 +1,5 @@
import { Box } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+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/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx
index cdcec821..575f788b 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx
@@ -1,5 +1,5 @@
import { Box } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { useState } from 'react'
import { H2 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx b/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx
index e790dbf6..f7fd5cce 100644
--- a/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx
@@ -1,5 +1,5 @@
import { useMutation, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { Form, Formik } from 'formik'
import React, { useContext, useState } from 'react'
import { useHistory } from 'react-router-dom'
diff --git a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx
index 0b43c05f..82f73041 100644
--- a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx
@@ -1,5 +1,5 @@
import { useMutation, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { startAssertion } from '@simplewebauthn/browser'
import { Field, Form, Formik } from 'formik'
import React, { useState, useContext } from 'react'
diff --git a/new-lamassu-admin/src/pages/Authentication/Login.jsx b/new-lamassu-admin/src/pages/Authentication/Login.jsx
index e11a1454..060b4299 100644
--- a/new-lamassu-admin/src/pages/Authentication/Login.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Login.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Grid } from '@mui/material'
+import { Grid } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import LoginCard from './LoginCard'
diff --git a/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx b/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx
index 44a1da1b..e9c1da4c 100644
--- a/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx
@@ -1,5 +1,5 @@
import Paper from '@mui/material/Paper'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { useReducer } from 'react'
import { H5 } from 'src/components/typography'
import Logo from 'src/styling/icons/menu/logo.svg?react'
diff --git a/new-lamassu-admin/src/pages/Authentication/LoginState.jsx b/new-lamassu-admin/src/pages/Authentication/LoginState.jsx
index 34f0d684..f5f89055 100644
--- a/new-lamassu-admin/src/pages/Authentication/LoginState.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/LoginState.jsx
@@ -1,5 +1,5 @@
import { useMutation, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { startAssertion } from '@simplewebauthn/browser'
import { Field, Form, Formik } from 'formik'
import React, { useContext } from 'react'
diff --git a/new-lamassu-admin/src/pages/Authentication/Register.jsx b/new-lamassu-admin/src/pages/Authentication/Register.jsx
index ec4f779e..ef7a4703 100644
--- a/new-lamassu-admin/src/pages/Authentication/Register.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Grid } from '@mui/material'
+import { Grid } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import Paper from '@mui/material/Paper'
import { Field, Form, Formik } from 'formik'
import React, { useReducer } from 'react'
diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
index 4b1441fa..cff60ae5 100644
--- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Grid } from '@mui/material'
+import { Grid } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import Paper from '@mui/material/Paper'
import { Form, Formik } from 'formik'
import { QRCodeSVG as QRCode } from 'qrcode.react'
diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
index 1f741ff9..4eab703c 100644
--- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Grid } from '@mui/material'
+import { Grid } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import Paper from '@mui/material/Paper'
import { Field, Form, Formik } from 'formik'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx
index b56847d2..8ddb0594 100644
--- a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx
@@ -1,5 +1,5 @@
import { useMutation, useQuery, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { Form, Formik } from 'formik'
import { QRCodeSVG as QRCode } from 'qrcode.react'
import React, { useContext, useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
index e417c029..5a8344e6 100644
--- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
+++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
@@ -1,6 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
import { Box, Dialog, DialogContent, DialogActions } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx
index 4574f27e..2f554905 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { Form, Formik, Field } from 'formik'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
index 405f085b..feafa19f 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
@@ -1,5 +1,5 @@
import { Box } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { Formik, Form, Field } from 'formik'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx
index 6f7852bd..877ca6a8 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { DeleteDialog } from 'src/components/DeleteDialog'
diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.jsx b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx
index 9bbf82df..62678dce 100644
--- a/new-lamassu-admin/src/pages/Cashout/Cashout.jsx
+++ b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
diff --git a/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx b/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx
index 8b12b3de..a7b210c0 100644
--- a/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx
+++ b/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { H1, P, Info2 } from 'src/components/typography'
import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react'
diff --git a/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx b/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx
index 8f15e98b..9e4a70b1 100644
--- a/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx
+++ b/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { Formik, Form, Field } from 'formik'
import React from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
diff --git a/new-lamassu-admin/src/pages/Commissions/Commissions.jsx b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx
index fa8d6645..36b2388b 100644
--- a/new-lamassu-admin/src/pages/Commissions/Commissions.jsx
+++ b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx
index 17a19095..0889e6dd 100644
--- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx
+++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
import {
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.jsx b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx
index 71886a41..e1f9a265 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerData.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx
@@ -1,5 +1,5 @@
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import { useState, React } from 'react'
import ImagePopper from 'src/components/ImagePopper'
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx b/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx
index dd80b721..8e8f01b7 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import { React, useState } from 'react'
import { H3 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx
index 417f8064..4c51ae02 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Paper } from '@mui/material'
+import { Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { format } from 'date-fns/fp'
import * as R from 'ramda'
import { React, useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx
index 5aa9d4ed..67f47227 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx
@@ -1,12 +1,12 @@
import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client";
import {
- makeStyles,
Breadcrumbs,
Box,
DialogActions,
DialogContent,
Dialog
} from '@mui/material'
+import { makeStyles } from '@mui/styles'
import NavigateNextIcon from '@mui/icons-material/NavigateNext'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/Customers.jsx b/new-lamassu-admin/src/pages/Customers/Customers.jsx
index 0626ee3e..e2aa5af8 100644
--- a/new-lamassu-admin/src/pages/Customers/Customers.jsx
+++ b/new-lamassu-admin/src/pages/Customers/Customers.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { Box, makeStyles } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { useHistory } from 'react-router-dom'
diff --git a/new-lamassu-admin/src/pages/Customers/CustomersList.jsx b/new-lamassu-admin/src/pages/Customers/CustomersList.jsx
index a53216c8..1eefc1be 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomersList.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomersList.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { format } from 'date-fns/fp'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/Wizard.jsx b/new-lamassu-admin/src/pages/Customers/Wizard.jsx
index 019e0318..3dcd91d5 100644
--- a/new-lamassu-admin/src/pages/Customers/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/Wizard.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { Form, Formik } from 'formik'
import * as R from 'ramda'
import React, { useState, Fragment } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
index 42298345..ba7e1484 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { Field, Form, Formik } from 'formik'
import { parsePhoneNumberWithError } from 'libphonenumber-js'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx b/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx
index 04b9f0d0..037a161f 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { useState } from 'react'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
index 57afa313..e3596921 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo } from 'react'
import { H2, Label1, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx
index 57f5468d..f35041ba 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import CustomerDataReversedIcon from 'src/styling/icons/customer-nav/data/comet.svg?react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx
index 82ae8b55..1952a0c3 100644
--- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx
@@ -1,5 +1,5 @@
import { CardContent, Card, Grid } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Form, Formik, Field as FormikField } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Customers/components/Field.jsx b/new-lamassu-admin/src/pages/Customers/components/Field.jsx
index ef540df2..7992773d 100644
--- a/new-lamassu-admin/src/pages/Customers/components/Field.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/Field.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
import { Info3, Label1 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx
index 5cb0a6c6..549f4fce 100644
--- a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx
@@ -1,5 +1,5 @@
import { Paper } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { memo } from 'react'
import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
index 7b206d77..1853e8e3 100644
--- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo } from 'react'
import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx
index e38e075c..542ebeb4 100644
--- a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx
@@ -1,6 +1,6 @@
import ButtonBase from '@mui/material/ButtonBase'
import Paper from '@mui/material/Card'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
import { InformativeDialog } from 'src/components/InformativeDialog'
diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx b/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx
index d84a65a0..6b4a8337 100644
--- a/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo, useState } from 'react'
import { Carousel } from 'src/components/Carousel'
diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
index a16f5599..771f20c0 100644
--- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
@@ -1,5 +1,6 @@
import { toUnit } from '@lamassu/coins/lightUtils'
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Customers/components/Upload.jsx b/new-lamassu-admin/src/pages/Customers/components/Upload.jsx
index a0541697..e2f63e7b 100644
--- a/new-lamassu-admin/src/pages/Customers/components/Upload.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/Upload.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { useFormikContext } from 'formik'
import * as R from 'ramda'
import React, { useState, useCallback } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
index 0db848e5..c4c9b7cc 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Paper } from '@mui/material'
+import { Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classNames from 'classnames'
import { React } from 'react'
import { P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx
index 75f172e6..6325bb7d 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import { Form, Formik, Field } from 'formik'
import { React } from 'react'
import ErrorMessage from 'src/components/ErrorMessage'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
index 8ca7123d..07ef4889 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Paper } from '@mui/material'
+import { Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import { React } from 'react'
import { H3, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
index 96c5e908..6b979eb7 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Paper } from '@mui/material'
+import { Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { formatDurationWithOptions, intervalToDuration } from 'date-fns/fp'
import { Form, Formik, Field } from 'formik'
import { React, useRef } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
index 9ad6c2f9..3d2c4036 100644
--- a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
@@ -1,5 +1,5 @@
import { Paper } from '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { memo } from 'react'
import { MainStatus } from 'src/components/Status'
diff --git a/new-lamassu-admin/src/pages/Customers/helper.jsx b/new-lamassu-admin/src/pages/Customers/helper.jsx
index 7e3902cc..bbfd9b20 100644
--- a/new-lamassu-admin/src/pages/Customers/helper.jsx
+++ b/new-lamassu-admin/src/pages/Customers/helper.jsx
@@ -1,5 +1,6 @@
import React from 'react'
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { parse, isValid, format } from 'date-fns/fp'
import { Field, useFormikContext } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx
index caac5087..17b89f2f 100644
--- a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx
@@ -1,7 +1,7 @@
import { useQuery, gql } from "@apollo/client";
import Button from '@mui/material/Button'
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx
index 9792809e..478b0876 100644
--- a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import List from '@mui/material/List'
import ListItem from '@mui/material/ListItem'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx b/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx
index 03ef83d1..e3b7eb07 100644
--- a/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx
@@ -1,6 +1,6 @@
import { useQuery, gql } from "@apollo/client";
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { useHistory } from 'react-router-dom'
diff --git a/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx b/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx
index 0d620de1..ab6ab6ad 100644
--- a/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import Grid from '@mui/material/Grid'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
diff --git a/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx b/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx
index b6aa96f9..8cda8eec 100644
--- a/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx
@@ -1,5 +1,5 @@
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import styles from './Dashboard.styles'
diff --git a/new-lamassu-admin/src/pages/Dashboard/RightSide.jsx b/new-lamassu-admin/src/pages/Dashboard/RightSide.jsx
index ec550e93..82eb332e 100644
--- a/new-lamassu-admin/src/pages/Dashboard/RightSide.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/RightSide.jsx
@@ -1,6 +1,6 @@
import Button from '@mui/material/Button'
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { useState } from 'react'
import CollapsibleCard, { cardState } from 'src/components/CollapsibleCard'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx
index 8901348a..7a8aa683 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React from 'react'
import { Label1 } from 'src/components/typography/index'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx
index fa61bc28..e12ac98b 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx
index 0f88551a..cd3552b1 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx
@@ -1,6 +1,6 @@
import { useQuery, gql } from "@apollo/client";
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
import { isAfter } from 'date-fns/fp'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx
index eafb7421..94d1c68b 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles, withStyles } from '@mui/material'
+import { makeStyles, withStyles } from '@mui/styles'
import Table from '@mui/material/Table'
import TableBody from '@mui/material/TableBody'
import TableCell from '@mui/material/TableCell'
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx
index 85b60a38..ff01f03d 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx
@@ -1,7 +1,7 @@
import { useQuery, gql } from "@apollo/client";
import Button from '@mui/material/Button'
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Funding.jsx b/new-lamassu-admin/src/pages/Funding.jsx
index 871ec653..05bd61ad 100644
--- a/new-lamassu-admin/src/pages/Funding.jsx
+++ b/new-lamassu-admin/src/pages/Funding.jsx
@@ -1,6 +1,6 @@
import { useQuery, gql } from "@apollo/client";
import { formatCryptoAddress } from '@lamassu/coins/lightUtils'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
import { format } from 'date-fns/fp'
diff --git a/new-lamassu-admin/src/pages/Locales/Locales.jsx b/new-lamassu-admin/src/pages/Locales/Locales.jsx
index 2cb03f79..fcb32433 100644
--- a/new-lamassu-admin/src/pages/Locales/Locales.jsx
+++ b/new-lamassu-admin/src/pages/Locales/Locales.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+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/LoyaltyPanel/IndividualDiscountModal.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx
index 539754d2..6868330d 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+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/LoyaltyPanel/IndividualDiscounts.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
index d045afc9..f2f1ff44 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { DeleteDialog } from 'src/components/DeleteDialog'
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
index a63c0ffc..33aec913 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { DeleteDialog } from 'src/components/DeleteDialog'
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx
index d29a59e1..25556f6e 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+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/MachineLogs.jsx b/new-lamassu-admin/src/pages/MachineLogs.jsx
index 2bdc1d5b..5e33fdae 100644
--- a/new-lamassu-admin/src/pages/MachineLogs.jsx
+++ b/new-lamassu-admin/src/pages/MachineLogs.jsx
@@ -1,5 +1,5 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx
index 66f7b28e..04dfb6b6 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx
@@ -1,5 +1,5 @@
import { useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import DataTable from 'src/components/tables/DataTable'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx
index dcd12d52..7b9105da 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import { Label3, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx
index 9e8f4a1c..a9f42060 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import BigNumber from 'bignumber.js'
import { formatDistance } from 'date-fns'
import React from 'react'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
index a72247a2..cde79f18 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx
index 2f9e4820..bca7c908 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx
@@ -1,6 +1,6 @@
import { useQuery, useLazyQuery, gql } from "@apollo/client";
import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
-import { makeStyles } from '@mui/material'
+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/Machines/MachineSidebar.jsx b/new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx
index 0fbec6c4..1181d615 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx
@@ -1,7 +1,7 @@
import List from '@mui/material/List'
import ListItem from '@mui/material/ListItem'
import ListItemText from '@mui/material/ListItemText'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React from 'react'
import styles from './Machines.styles'
diff --git a/new-lamassu-admin/src/pages/Machines/Machines.jsx b/new-lamassu-admin/src/pages/Machines/Machines.jsx
index 674a8df7..7055151a 100644
--- a/new-lamassu-admin/src/pages/Machines/Machines.jsx
+++ b/new-lamassu-admin/src/pages/Machines/Machines.jsx
@@ -1,7 +1,7 @@
import { useQuery, gql } from "@apollo/client";
import Breadcrumbs from '@mui/material/Breadcrumbs'
import Grid from '@mui/material/Grid'
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import NavigateNextIcon from '@mui/icons-material/NavigateNext'
import classnames from 'classnames'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx
index 4c7b3c15..1d027869 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React from 'react'
import Chip from 'src/components/Chip'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
index c8338af5..8508edb0 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { DialogActions, makeStyles, Box } from '@mui/material'
+import { DialogActions, Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx
index cea17f48..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 '@mui/material'
+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 e77c5726..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 '@mui/material'
+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 49edc5be..d9b5c8f9 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 '@mui/material'
-import { makeStyles } from '@mui/material/styles'
+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 20f05896..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 '@mui/material/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 adc31043..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 '@mui/material'
+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 58c82858..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 '@mui/material'
+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 09dce4b2..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 '@mui/material'
+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/Notifications/components/EditHeader.jsx b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx
index 45b6c744..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 '@mui/material'
+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'
diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx
index d66234a5..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 '@mui/material'
+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 5af68822..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 '@mui/material'
+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 54cca64d..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 '@mui/material'
+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 d6160c46..05b0fdc2 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
+++ b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useContext } from 'react'
import {
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx
index 0f3f189c..5ef31d8f 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import React, { memo } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
import { H4, P, Label2 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx
index 7e5d288c..c00b1249 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Form, Formik, Field as FormikField } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx
index 3d459147..c3561d0e 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo } from 'react'
import { H4, P, Label2 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx
index 9fb89c49..b14ea9f4 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { memo } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx
index 3c73dc0b..1c76b064 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Paper } from '@mui/material'
+import { Paper } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import * as R from 'ramda'
import React, { useState } from 'react'
import { HelpTooltip } from 'src/components/Tooltip'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
index 4b0681b8..278dedff 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 '@mui/material'
+import { Chip } from '@mui/material'
+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 e6b4519c..8dab6f7a 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx
@@ -1,5 +1,5 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import { Form, Formik, Field as FormikField } from 'formik'
import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/ServerLogs.jsx b/new-lamassu-admin/src/pages/ServerLogs.jsx
index 939b42fc..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 '@mui/material'
+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 6495f88e..cddc4f6f 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 '@mui/material'
+import { Grid } from '@mui/material'
+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 1ec790c4..aafe0ff9 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 '@mui/material'
+import { Grid } from '@mui/material'
+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/Transactions/CopyToClipboard.jsx b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx
index 12ca1097..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 '@mui/material/styles'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState, useEffect } from 'react'
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
index 4d37cc51..29464fdf 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 '@mui/material'
+import { Box } from '@mui/material'
+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 453ac8ac..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 '@mui/material'
+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 31d3a9ef..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 '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx
index a92d8686..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 '@mui/material'
+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 f97eb34e..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 '@mui/material'
+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 e82da9a0..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 '@mui/material'
+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 90401d32..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 '@mui/material'
+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 daf1d718..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 '@mui/material'
+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 eb8405b7..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 '@mui/material'
+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 9c80f447..193fa0da 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 '@mui/material'
+import { Box } from '@mui/material'
+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 7da853f6..2c1cf485 100644
--- a/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, gql } from "@apollo/client";
-import { makeStyles, Box } from '@mui/material'
+import { Box } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import * as R from 'ramda'
import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Triggers/Wizard.jsx b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx
index 577063dd..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 '@mui/material'
+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/helper.jsx b/new-lamassu-admin/src/pages/Triggers/helper.jsx
index 429c6255..1bb0b887 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 '@mui/material'
+import { Box } from '@mui/material'
+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 cde4ee00..ae0260cc 100644
--- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
@@ -1,5 +1,6 @@
import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client";
-import { makeStyles, Box, Chip } from '@mui/material'
+import { Box, Chip } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import { startAttestation } from '@simplewebauthn/browser'
import * as R from 'ramda'
import React, { useReducer, useState, useContext } from 'react'
diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx
index ddaae2ad..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 '@mui/material/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 9334f76a..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 '@mui/material/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 68e24db9..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 '@mui/material/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 812c3de8..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 '@mui/material/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 f764245e..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 '@mui/material/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 d2864067..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 '@mui/material/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 69e559bc..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 '@mui/material/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 3406caee..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 '@mui/material'
+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 215a92df..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 '@mui/material'
+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 c3a0c270..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 '@mui/material'
+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/Wizard/Wizard.jsx b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
index 9733690d..69f6c597 100644
--- a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
@@ -1,5 +1,6 @@
import { useQuery, gql } from "@apollo/client";
-import { makeStyles, Dialog, DialogContent } from '@mui/material'
+import { Dialog, DialogContent } from '@mui/material'
+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 2336115a..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 '@mui/material'
+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 f4394a4e..32b6ac64 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
@@ -1,4 +1,5 @@
-import { makeStyles, Drawer, Grid } from '@mui/material'
+import { Drawer, Grid } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import classnames from 'classnames'
import React, { useState } from 'react'
import Modal from 'src/components/Modal'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx b/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx
index e3756df0..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 '@mui/material'
+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 ed619c28..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 '@mui/material'
+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 014b00fc..6506312c 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@mui/material'
+import { makeStyles } from '@mui/styles'
import Grid from '@mui/material/Grid'
import React, { useState } from 'react'
import Sidebar from 'src/components/layout/Sidebar'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx b/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx
index f85f19e6..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 '@mui/material'
+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 fed8b74a..5d977304 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 '@mui/material'
+import { Box } from '@mui/material'
+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 0cb3318f..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 '@mui/material'
+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 a9c79015..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 '@mui/material'
+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 949f7f7c..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 '@mui/material'
+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 dfac3102..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 '@mui/material'
+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 6a9c14ed..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 '@mui/material'
+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 2a40f8fc..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 '@mui/material'
+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 02afcb08..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 '@mui/material'
+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 fb6014e2..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 '@mui/material'
+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 e3d7aeaf..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 '@mui/material/Fade'
import Slide from '@mui/material/Slide'
-import { makeStyles } from '@mui/material/styles'
+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 77e8e2b4..34d1e0ef 100644
--- a/new-lamassu-admin/src/styling/theme.js
+++ b/new-lamassu-admin/src/styling/theme.js
@@ -107,7 +107,7 @@ export default createTheme(adaptV4Theme({
},
MuiFormLabel: {
root: {
- '&$focused': {
+ '&.Mui-focused': {
color: fontColor
}
}
@@ -121,7 +121,7 @@ export default createTheme(adaptV4Theme({
},
MuiToggleButton: {
root: {
- '&$selected': {
+ '&.Mui-selected': {
backgroundColor: zircon,
borderColor: primaryColor,
borderTopColor: [primaryColor, '!important'],