From 58f53d92a8806234bef14884dc5c63ab84c9afd0 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 15 Apr 2025 12:04:12 +0100 Subject: [PATCH 01/10] partial: @mui update imports --- new-lamassu-admin/package-lock.json | 776 +++++++++++++++++- new-lamassu-admin/package.json | 9 +- new-lamassu-admin/src/App.jsx | 8 +- new-lamassu-admin/src/components/Carousel.jsx | 2 +- new-lamassu-admin/src/components/Chip.jsx | 4 +- .../src/components/CollapsibleCard.jsx | 4 +- .../src/components/ConfirmDialog.jsx | 2 +- .../src/components/DeleteDialog.jsx | 2 +- .../src/components/ErrorMessage.jsx | 2 +- .../src/components/ImagePopper.jsx | 2 +- .../src/components/InfoMessage.jsx | 2 +- .../src/components/InformativeDialog.jsx | 2 +- .../src/components/LogsDownloaderPopper.jsx | 2 +- new-lamassu-admin/src/components/Modal.jsx | 2 +- .../NotificationCenter/NotificationCenter.jsx | 2 +- .../NotificationCenter/NotificationRow.jsx | 2 +- new-lamassu-admin/src/components/Popper.jsx | 2 +- .../src/components/SearchBox.jsx | 8 +- .../src/components/SearchFilter.jsx | 2 +- new-lamassu-admin/src/components/Stage.jsx | 2 +- new-lamassu-admin/src/components/Status.jsx | 4 +- new-lamassu-admin/src/components/Stepper.jsx | 2 +- new-lamassu-admin/src/components/Subtitle.jsx | 2 +- .../src/components/TableLabel.jsx | 2 +- new-lamassu-admin/src/components/Title.jsx | 2 +- new-lamassu-admin/src/components/Tooltip.jsx | 2 +- new-lamassu-admin/src/components/Uptime.jsx | 4 +- .../BooleanPropertiesTable.jsx | 2 +- .../src/components/buttons/ActionButton.jsx | 2 +- .../src/components/buttons/AddButton.jsx | 2 +- .../src/components/buttons/Button.jsx | 2 +- .../src/components/buttons/DeleteButton.jsx | 2 +- .../src/components/buttons/FeatureButton.jsx | 2 +- .../src/components/buttons/IDButton.jsx | 4 +- .../src/components/buttons/IconButton.jsx | 2 +- .../src/components/buttons/Link.jsx | 2 +- .../src/components/buttons/Link.styles.js | 2 +- .../src/components/buttons/SubpageButton.jsx | 2 +- .../components/buttons/SupportLinkButton.jsx | 2 +- .../components/date-range-picker/Calendar.jsx | 2 +- .../date-range-picker/DateRangePicker.jsx | 2 +- .../src/components/date-range-picker/Tile.jsx | 2 +- .../editableProperty/EditableProperty.jsx | 2 +- .../src/components/editableTable/Header.jsx | 2 +- .../src/components/editableTable/Row.jsx | 2 +- .../src/components/editableTable/Table.jsx | 2 +- .../src/components/fake-table/Table.jsx | 6 +- .../components/inputs/base/Autocomplete.jsx | 4 +- .../src/components/inputs/base/Checkbox.jsx | 8 +- .../src/components/inputs/base/CodeInput.jsx | 2 +- .../src/components/inputs/base/Dropdown.jsx | 8 +- .../src/components/inputs/base/RadioGroup.jsx | 2 +- .../src/components/inputs/base/Select.jsx | 2 +- .../src/components/inputs/base/Switch.jsx | 4 +- .../src/components/inputs/base/TextInput.jsx | 4 +- .../inputs/base/ToggleButtonGroup.jsx | 6 +- .../src/components/inputs/cashbox/Cashbox.jsx | 2 +- .../inputs/formik/CashCassetteInput.jsx | 2 +- .../src/components/layout/Header.jsx | 6 +- .../src/components/layout/Section.jsx | 2 +- .../src/components/layout/Sidebar.jsx | 2 +- .../src/components/layout/TitleSection.jsx | 2 +- .../machineActions/DiagnosticsModal.jsx | 2 +- .../machineActions/MachineActions.jsx | 2 +- .../single-row-table/SingleRowTable.jsx | 2 +- .../src/components/table/EmptyTable.jsx | 2 +- .../src/components/table/Table.jsx | 2 +- .../src/components/table/TableCell.jsx | 2 +- .../src/components/table/TableHeader.jsx | 2 +- .../src/components/table/TableRow.jsx | 2 +- .../src/components/tables/DataTable.jsx | 2 +- .../src/components/typography/index.jsx | 2 +- .../src/pages/AddMachine/AddMachine.jsx | 4 +- .../src/pages/Analytics/Analytics.jsx | 4 +- .../Analytics/components/LegendEntry.jsx | 2 +- .../components/tooltips/GraphTooltip.jsx | 4 +- .../components/wrappers/HourOfDayWrapper.jsx | 4 +- .../components/wrappers/OverTimeWrapper.jsx | 4 +- .../wrappers/TopMachinesWrapper.jsx | 4 +- .../wrappers/VolumeOverTimeWrapper.jsx | 4 +- .../pages/Authentication/Input2FAState.jsx | 2 +- .../pages/Authentication/InputFIDOState.jsx | 2 +- .../src/pages/Authentication/Login.jsx | 2 +- .../src/pages/Authentication/LoginCard.jsx | 4 +- .../src/pages/Authentication/LoginState.jsx | 2 +- .../src/pages/Authentication/Register.jsx | 4 +- .../src/pages/Authentication/Reset2FA.jsx | 4 +- .../pages/Authentication/ResetPassword.jsx | 4 +- .../pages/Authentication/Setup2FAState.jsx | 2 +- .../src/pages/Blacklist/Blacklist.jsx | 4 +- .../src/pages/Blacklist/BlacklistAdvanced.jsx | 2 +- .../src/pages/Blacklist/BlacklistModal.jsx | 4 +- .../src/pages/Blacklist/BlacklistTable.jsx | 2 +- .../src/pages/Cashout/Cashout.jsx | 2 +- .../src/pages/Cashout/WizardSplash.jsx | 2 +- .../src/pages/Cashout/WizardStep.jsx | 2 +- .../src/pages/Commissions/Commissions.jsx | 2 +- .../components/CommissionsList.jsx | 2 +- .../src/pages/Customers/CustomerData.jsx | 4 +- .../src/pages/Customers/CustomerNotes.jsx | 2 +- .../src/pages/Customers/CustomerPhotos.jsx | 2 +- .../src/pages/Customers/CustomerProfile.jsx | 4 +- .../src/pages/Customers/Customers.jsx | 2 +- .../src/pages/Customers/CustomersList.jsx | 2 +- .../src/pages/Customers/Wizard.jsx | 2 +- .../components/CreateCustomerModal.jsx | 2 +- .../components/CustomInfoRequestsData.jsx | 2 +- .../Customers/components/CustomerDetails.jsx | 2 +- .../Customers/components/CustomerSidebar.jsx | 2 +- .../Customers/components/EditableCard.jsx | 4 +- .../src/pages/Customers/components/Field.jsx | 2 +- .../Customers/components/FrontCameraPhoto.jsx | 4 +- .../Customers/components/IdCardPhotoCard.jsx | 2 +- .../pages/Customers/components/IdDataCard.jsx | 2 +- .../pages/Customers/components/PhotosCard.jsx | 6 +- .../Customers/components/PhotosCarousel.jsx | 2 +- .../Customers/components/TransactionsList.jsx | 2 +- .../src/pages/Customers/components/Upload.jsx | 2 +- .../components/notes/NewNoteCard.jsx | 2 +- .../components/notes/NewNoteModal.jsx | 2 +- .../Customers/components/notes/NoteCard.jsx | 2 +- .../Customers/components/notes/NoteEdit.jsx | 2 +- .../components/propertyCard/PropertyCard.jsx | 4 +- .../src/pages/Customers/helper.jsx | 2 +- .../src/pages/Dashboard/Alerts/Alerts.jsx | 6 +- .../pages/Dashboard/Alerts/AlertsTable.jsx | 6 +- .../src/pages/Dashboard/Dashboard.jsx | 4 +- .../src/pages/Dashboard/Footer/Footer.jsx | 4 +- .../src/pages/Dashboard/LeftSide.jsx | 4 +- .../src/pages/Dashboard/RightSide.jsx | 6 +- .../Graphs/PercentageChart.jsx | 2 +- .../pages/Dashboard/SystemPerformance/Nav.jsx | 2 +- .../SystemPerformance/SystemPerformance.jsx | 4 +- .../Dashboard/SystemStatus/MachinesTable.jsx | 14 +- .../Dashboard/SystemStatus/SystemStatus.jsx | 6 +- new-lamassu-admin/src/pages/Funding.jsx | 2 +- .../src/pages/Locales/Locales.jsx | 2 +- .../LoyaltyPanel/IndividualDiscountModal.jsx | 2 +- .../LoyaltyPanel/IndividualDiscounts.jsx | 2 +- .../src/pages/LoyaltyPanel/PromoCodes.jsx | 2 +- .../pages/LoyaltyPanel/PromoCodesModal.jsx | 2 +- new-lamassu-admin/src/pages/MachineLogs.jsx | 2 +- .../MachineComponents/Cassettes/Cassettes.jsx | 2 +- .../Machines/MachineComponents/Details.jsx | 2 +- .../Machines/MachineComponents/Overview.jsx | 2 +- .../Transactions/DataTable.jsx | 2 +- .../Transactions/Transactions.jsx | 2 +- .../src/pages/Machines/MachineSidebar.jsx | 8 +- .../src/pages/Machines/Machines.jsx | 8 +- .../src/pages/Maintenance/CashUnitDetails.jsx | 2 +- .../src/pages/Maintenance/CashUnits.jsx | 2 +- .../src/pages/Maintenance/CashUnitsFooter.jsx | 2 +- .../src/pages/Maintenance/CashboxHistory.jsx | 2 +- .../pages/Maintenance/MachineDetailsCard.jsx | 4 +- .../Maintenance/MachineDetailsCard.styles.js | 2 +- .../src/pages/Maintenance/MachineStatus.jsx | 2 +- .../pages/Maintenance/Wizard/WizardSplash.jsx | 2 +- .../pages/Maintenance/Wizard/WizardStep.jsx | 2 +- .../Notifications/components/EditHeader.jsx | 2 +- .../components/EditableNumber.jsx | 2 +- .../sections/CryptoBalanceAlerts.jsx | 2 +- .../sections/FiatBalanceAlerts.jsx | 2 +- .../pages/Notifications/sections/Setup.jsx | 2 +- .../src/pages/OperatorInfo/CoinATMRadar.jsx | 2 +- .../src/pages/OperatorInfo/ContactInfo.jsx | 2 +- .../src/pages/OperatorInfo/MachineScreens.jsx | 2 +- .../pages/OperatorInfo/ReceiptPrinting.jsx | 2 +- .../OperatorInfo/SMSNotices/SMSNotices.jsx | 2 +- .../SMSNotices/SMSNoticesModal.jsx | 2 +- .../pages/OperatorInfo/TermsConditions.jsx | 2 +- new-lamassu-admin/src/pages/ServerLogs.jsx | 2 +- .../src/pages/Services/FormRenderer.jsx | 2 +- .../src/pages/Services/Services.jsx | 2 +- .../pages/Transactions/CopyToClipboard.jsx | 2 +- .../src/pages/Transactions/DetailsCard.jsx | 2 +- .../src/pages/Transactions/Transactions.jsx | 2 +- .../CustomInfoRequests/CustomInfoRequests.jsx | 2 +- .../CustomInfoRequests/DetailsCard.jsx | 2 +- .../Forms/TypeFields/ChoiceList.jsx | 2 +- .../Forms/TypeFields/NumericalEntry.jsx | 2 +- .../Forms/TypeFields/TextEntry.jsx | 2 +- .../Triggers/CustomInfoRequests/Wizard.jsx | 2 +- .../CustomInfoRequests/WizardSplash.jsx | 2 +- .../src/pages/Triggers/TriggerView.jsx | 2 +- .../src/pages/Triggers/Triggers.jsx | 2 +- .../src/pages/Triggers/Wizard.jsx | 2 +- .../src/pages/Triggers/helper.jsx | 2 +- .../pages/UserManagement/UserManagement.jsx | 2 +- .../UserManagement/modals/ChangeRoleModal.jsx | 2 +- .../UserManagement/modals/CreateUserModal.jsx | 2 +- .../UserManagement/modals/EnableUserModal.jsx | 2 +- .../pages/UserManagement/modals/FIDOModal.jsx | 2 +- .../UserManagement/modals/Input2FAModal.jsx | 2 +- .../UserManagement/modals/Reset2FAModal.jsx | 2 +- .../modals/ResetPasswordModal.jsx | 2 +- new-lamassu-admin/src/pages/Wallet/Wallet.jsx | 2 +- .../src/pages/Wallet/WizardSplash.jsx | 2 +- .../src/pages/Wallet/WizardStep.jsx | 2 +- new-lamassu-admin/src/pages/Wizard/Wizard.jsx | 2 +- .../pages/Wizard/components/Commissions.jsx | 2 +- .../src/pages/Wizard/components/Footer.jsx | 2 +- .../src/pages/Wizard/components/Locales.jsx | 2 +- .../src/pages/Wizard/components/Mailgun.jsx | 2 +- .../pages/Wizard/components/Notifications.jsx | 4 +- .../pages/Wizard/components/OperatorInfo.jsx | 2 +- .../src/pages/Wizard/components/Twilio.jsx | 2 +- .../pages/Wizard/components/Wallet/AllSet.jsx | 2 +- .../Wizard/components/Wallet/Blockcypher.jsx | 2 +- .../Wizard/components/Wallet/ChooseCoin.jsx | 2 +- .../components/Wallet/ChooseExchange.jsx | 2 +- .../Wizard/components/Wallet/ChooseTicker.jsx | 2 +- .../Wizard/components/Wallet/ChooseWallet.jsx | 2 +- .../pages/Wizard/components/Wallet/Wallet.jsx | 2 +- .../src/pages/Wizard/components/Welcome.jsx | 2 +- new-lamassu-admin/src/routing/routes.jsx | 6 +- new-lamassu-admin/src/styling/theme.js | 2 +- 216 files changed, 1035 insertions(+), 326 deletions(-) diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 0036e122..c2cbde59 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -10,10 +10,16 @@ "license": "../LICENSE", "dependencies": { "@apollo/client": "^3.13.7", + "@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", + "@mui/styles": "^5.17.1", "@simplewebauthn/browser": "^3.0.0", "apollo-upload-client": "^18.0.0", "bignumber.js": "9.0.0", @@ -120,7 +126,6 @@ "version": "7.26.2", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", @@ -176,7 +181,6 @@ "version": "7.27.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.27.0", @@ -259,7 +263,6 @@ "version": "7.25.9", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.25.9", @@ -346,7 +349,6 @@ "version": "7.25.9", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -356,7 +358,6 @@ "version": "7.25.9", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -390,7 +391,6 @@ "version": "7.27.0", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.27.0" @@ -436,7 +436,6 @@ "version": "7.27.0", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", @@ -451,7 +450,6 @@ "version": "7.27.0", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", @@ -470,7 +468,6 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -480,7 +477,6 @@ "version": "7.27.0", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -490,12 +486,176 @@ "node": ">=6.9.0" } }, + "node_modules/@emotion/babel-plugin": { + "version": "11.13.5", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", + "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.16.7", + "@babel/runtime": "^7.18.3", + "@emotion/hash": "^0.9.2", + "@emotion/memoize": "^0.9.0", + "@emotion/serialize": "^1.3.3", + "babel-plugin-macros": "^3.1.0", + "convert-source-map": "^1.5.0", + "escape-string-regexp": "^4.0.0", + "find-root": "^1.1.0", + "source-map": "^0.5.7", + "stylis": "4.2.0" + } + }, + "node_modules/@emotion/babel-plugin/node_modules/@emotion/hash": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", + "license": "MIT" + }, + "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "license": "MIT" + }, + "node_modules/@emotion/cache": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz", + "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==", + "license": "MIT", + "dependencies": { + "@emotion/memoize": "^0.9.0", + "@emotion/sheet": "^1.4.0", + "@emotion/utils": "^1.4.2", + "@emotion/weak-memoize": "^0.4.0", + "stylis": "4.2.0" + } + }, "node_modules/@emotion/hash": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==", "license": "MIT" }, + "node_modules/@emotion/is-prop-valid": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz", + "integrity": "sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==", + "license": "MIT", + "dependencies": { + "@emotion/memoize": "^0.9.0" + } + }, + "node_modules/@emotion/memoize": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz", + "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==", + "license": "MIT" + }, + "node_modules/@emotion/react": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", + "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.18.3", + "@emotion/babel-plugin": "^11.13.5", + "@emotion/cache": "^11.14.0", + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2", + "@emotion/weak-memoize": "^0.4.0", + "hoist-non-react-statics": "^3.3.1" + }, + "peerDependencies": { + "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@emotion/serialize": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz", + "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==", + "license": "MIT", + "dependencies": { + "@emotion/hash": "^0.9.2", + "@emotion/memoize": "^0.9.0", + "@emotion/unitless": "^0.10.0", + "@emotion/utils": "^1.4.2", + "csstype": "^3.0.2" + } + }, + "node_modules/@emotion/serialize/node_modules/@emotion/hash": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", + "license": "MIT" + }, + "node_modules/@emotion/serialize/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + }, + "node_modules/@emotion/sheet": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz", + "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==", + "license": "MIT" + }, + "node_modules/@emotion/styled": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz", + "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.18.3", + "@emotion/babel-plugin": "^11.13.5", + "@emotion/is-prop-valid": "^1.3.0", + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2" + }, + "peerDependencies": { + "@emotion/react": "^11.0.0-rc.0", + "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@emotion/unitless": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz", + "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==", + "license": "MIT" + }, + "node_modules/@emotion/use-insertion-effect-with-fallbacks": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz", + "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.8.0" + } + }, + "node_modules/@emotion/utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz", + "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==", + "license": "MIT" + }, + "node_modules/@emotion/weak-memoize": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz", + "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==", + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", @@ -1085,6 +1245,44 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@floating-ui/core": { + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz", + "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==", + "license": "MIT", + "dependencies": { + "@floating-ui/utils": "^0.2.9" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.6.13", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz", + "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==", + "license": "MIT", + "dependencies": { + "@floating-ui/core": "^1.6.0", + "@floating-ui/utils": "^0.2.9" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz", + "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==", + "license": "MIT", + "dependencies": { + "@floating-ui/dom": "^1.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz", + "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==", + "license": "MIT" + }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", @@ -1164,7 +1362,6 @@ "version": "0.3.8", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", @@ -1179,7 +1376,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -1189,7 +1385,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -1199,14 +1394,12 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -1447,6 +1640,452 @@ "react-dom": "^16.8.0 || ^17.0.0" } }, + "node_modules/@mui/base": { + "version": "5.0.0-beta.40", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz", + "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==", + "deprecated": "This package has been replaced by @base-ui-components/react", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@floating-ui/react-dom": "^2.0.8", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "@popperjs/core": "^2.11.8", + "clsx": "^2.1.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/base/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/core-downloads-tracker": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.17.1.tgz", + "integrity": "sha512-OcZj+cs6EfUD39IoPBOgN61zf1XFVY+imsGoBDwXeSq2UHJZE3N59zzBOVjclck91Ne3e9gudONOeILvHCIhUA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + } + }, + "node_modules/@mui/icons-material": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.17.1.tgz", + "integrity": "sha512-CN86LocjkunFGG0yPlO4bgqHkNGgaEOEc3X/jG5Bzm401qYw79/SaLrofA7yAKCCXAGdIGnLoMHohc3+ubs95A==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@mui/material": "^5.0.0", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/lab": { + "version": "5.0.0-alpha.170", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.170.tgz", + "integrity": "sha512-0bDVECGmrNjd3+bLdcLiwYZ0O4HP5j5WSQm5DV6iA/Z9kr8O6AnvZ1bv9ImQbbX7Gj3pX4o43EKwCutj3EQxQg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/base": "5.0.0-beta.40", + "@mui/system": "^5.15.15", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.5.0", + "@emotion/styled": "^11.3.0", + "@mui/material": ">=5.15.0", + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/lab/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/material": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.17.1.tgz", + "integrity": "sha512-2B33kQf+GmPnrvXXweWAx+crbiUEsxCdCN979QDYnlH9ox4pd+0/IBriWLV+l6ORoBF60w39cWjFnJYGFdzXcw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/core-downloads-tracker": "^5.17.1", + "@mui/system": "^5.17.1", + "@mui/types": "~7.2.15", + "@mui/utils": "^5.17.1", + "@popperjs/core": "^2.11.8", + "@types/react-transition-group": "^4.4.10", + "clsx": "^2.1.0", + "csstype": "^3.1.3", + "prop-types": "^15.8.1", + "react-is": "^19.0.0", + "react-transition-group": "^4.4.5" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.5.0", + "@emotion/styled": "^11.3.0", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/material/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/material/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + }, + "node_modules/@mui/material/node_modules/react-is": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.1.0.tgz", + "integrity": "sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==", + "license": "MIT" + }, + "node_modules/@mui/private-theming": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.17.1.tgz", + "integrity": "sha512-XMxU0NTYcKqdsG8LRmSoxERPXwMbp16sIXPcLVgLGII/bVNagX0xaheWAwFv8+zDK7tI3ajllkuD3GZZE++ICQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/utils": "^5.17.1", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/styled-engine": { + "version": "5.16.14", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.14.tgz", + "integrity": "sha512-UAiMPZABZ7p8mUW4akDV6O7N3+4DatStpXMZwPlt+H/dA0lt67qawN021MNND+4QTpjaiMYxbhKZeQcyWCbuKw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@emotion/cache": "^11.13.5", + "csstype": "^3.1.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.4.1", + "@emotion/styled": "^11.3.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + } + }, + "node_modules/@mui/styled-engine/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + }, + "node_modules/@mui/styles": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.17.1.tgz", + "integrity": "sha512-GxNtcD1jXjj1i81vyuaeNxCpph/ApxSxgJ+G8A2jUY5/bMOxXSmgUdupbB0JLexsDIqmaSqTePVN0jnMZc1iZQ==", + "deprecated": "Deprecated, check the migration instruction in https://mui.com/material-ui/migration/migrating-from-jss/", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@emotion/hash": "^0.9.1", + "@mui/private-theming": "^5.17.1", + "@mui/types": "~7.2.15", + "@mui/utils": "^5.17.1", + "clsx": "^2.1.0", + "csstype": "^3.1.3", + "hoist-non-react-statics": "^3.3.2", + "jss": "^10.10.0", + "jss-plugin-camel-case": "^10.10.0", + "jss-plugin-default-unit": "^10.10.0", + "jss-plugin-global": "^10.10.0", + "jss-plugin-nested": "^10.10.0", + "jss-plugin-props-sort": "^10.10.0", + "jss-plugin-rule-value-function": "^10.10.0", + "jss-plugin-vendor-prefixer": "^10.10.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/styles/node_modules/@emotion/hash": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", + "license": "MIT" + }, + "node_modules/@mui/styles/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/styles/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + }, + "node_modules/@mui/system": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.17.1.tgz", + "integrity": "sha512-aJrmGfQpyF0U4D4xYwA6ueVtQcEMebET43CUmKMP7e7iFh3sMIF3sBR0l8Urb4pqx1CBjHAaWgB0ojpND4Q3Jg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/private-theming": "^5.17.1", + "@mui/styled-engine": "^5.16.14", + "@mui/types": "~7.2.15", + "@mui/utils": "^5.17.1", + "clsx": "^2.1.0", + "csstype": "^3.1.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.5.0", + "@emotion/styled": "^11.3.0", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/system/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/system/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + }, + "node_modules/@mui/types": { + "version": "7.2.24", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.24.tgz", + "integrity": "sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/utils": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.17.1.tgz", + "integrity": "sha512-jEZ8FTqInt2WzxDV8bhImWBqeQRD99c/id/fq83H0ER9tFl+sfZlaAoCdznGvbSQQ9ividMxqSV2c7cC1vBcQg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/types": "~7.2.15", + "@types/prop-types": "^15.7.12", + "clsx": "^2.1.1", + "prop-types": "^15.8.1", + "react-is": "^19.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/utils/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/utils/node_modules/react-is": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.1.0.tgz", + "integrity": "sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==", + "license": "MIT" + }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@rollup/pluginutils": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", @@ -2234,6 +2873,12 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "license": "MIT" + }, "node_modules/@types/prop-types": { "version": "15.7.14", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz", @@ -2646,6 +3291,66 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/babel-plugin-macros": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", + "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.12.5", + "cosmiconfig": "^7.0.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">=10", + "npm": ">=6" + } + }, + "node_modules/babel-plugin-macros/node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "license": "MIT", + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/babel-plugin-macros/node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/babel-plugin-macros/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -3021,7 +3726,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -3723,7 +4427,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -3984,7 +4687,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" @@ -4229,7 +4931,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -4594,6 +5295,12 @@ "node": ">=8" } }, + "node_modules/find-root": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", + "license": "MIT" + }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -4692,7 +5399,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5038,7 +5744,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -5172,7 +5877,6 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "dev": true, "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -5244,7 +5948,6 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, "license": "MIT" }, "node_modules/is-async-function": { @@ -5317,7 +6020,6 @@ "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -5723,7 +6425,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -5743,7 +6444,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, "license": "MIT" }, "node_modules/json-schema-traverse": { @@ -6016,7 +6716,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, "license": "MIT" }, "node_modules/lint-staged": { @@ -6349,7 +7048,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/nan": { @@ -6661,7 +7359,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "license": "MIT", "dependencies": { "callsites": "^3.0.0" @@ -6674,7 +7371,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", @@ -6722,7 +7418,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, "license": "MIT" }, "node_modules/path-to-regexp": { @@ -6738,7 +7433,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -6748,7 +7442,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -7284,7 +7977,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -7728,6 +8420,15 @@ "tslib": "^2.0.3" } }, + "node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -7921,6 +8622,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/stylis": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==", + "license": "MIT" + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -7938,7 +8645,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json index 0cc7f7fe..32ca64b2 100644 --- a/new-lamassu-admin/package.json +++ b/new-lamassu-admin/package.json @@ -5,10 +5,13 @@ "type": "module", "dependencies": { "@apollo/client": "^3.13.7", + "@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", + "@mui/styles": "^5.17.1", "@simplewebauthn/browser": "^3.0.0", "apollo-upload-client": "^18.0.0", "bignumber.js": "9.0.0", diff --git a/new-lamassu-admin/src/App.jsx b/new-lamassu-admin/src/App.jsx index 2a442104..e8f72672 100644 --- a/new-lamassu-admin/src/App.jsx +++ b/new-lamassu-admin/src/App.jsx @@ -1,13 +1,13 @@ import { useQuery, gql } from "@apollo/client"; -import CssBaseline from '@material-ui/core/CssBaseline' -import Grid from '@material-ui/core/Grid' -import Slide from '@material-ui/core/Slide' +import CssBaseline from '@mui/material/CssBaseline' +import Grid from '@mui/material/Grid' +import Slide from '@mui/material/Slide' import { StylesProvider, jssPreset, MuiThemeProvider, makeStyles -} from '@material-ui/core/styles' +} from '@mui/material/styles' import { create } from 'jss' import extendJss from 'jss-plugin-extend' import React, { useContext, useState } from 'react' diff --git a/new-lamassu-admin/src/components/Carousel.jsx b/new-lamassu-admin/src/components/Carousel.jsx index a16fad95..56bb29f4 100644 --- a/new-lamassu-admin/src/components/Carousel.jsx +++ b/new-lamassu-admin/src/components/Carousel.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 2f876c40..59735668 100644 --- a/new-lamassu-admin/src/components/Chip.jsx +++ b/new-lamassu-admin/src/components/Chip.jsx @@ -1,5 +1,5 @@ -import Chip from '@material-ui/core/Chip' -import { withStyles } from '@material-ui/core/styles' +import Chip from '@mui/material/Chip' +import { withStyles } from '@mui/material/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 574340a1..e360a87e 100644 --- a/new-lamassu-admin/src/components/CollapsibleCard.jsx +++ b/new-lamassu-admin/src/components/CollapsibleCard.jsx @@ -1,5 +1,5 @@ -import Grid from '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 0d849ed1..b692ef83 100644 --- a/new-lamassu-admin/src/components/ConfirmDialog.jsx +++ b/new-lamassu-admin/src/components/ConfirmDialog.jsx @@ -4,7 +4,7 @@ import { DialogContent, makeStyles, InputLabel -} from '@material-ui/core' +} from '@mui/material' 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 256c0f27..1cfd2a87 100644 --- a/new-lamassu-admin/src/components/DeleteDialog.jsx +++ b/new-lamassu-admin/src/components/DeleteDialog.jsx @@ -3,7 +3,7 @@ import { DialogActions, DialogContent, makeStyles -} from '@material-ui/core' +} from '@mui/material' 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 7433a70b..5df8af7d 100644 --- a/new-lamassu-admin/src/components/ErrorMessage.jsx +++ b/new-lamassu-admin/src/components/ErrorMessage.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' 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 a9291131..44aec2c9 100644 --- a/new-lamassu-admin/src/components/ImagePopper.jsx +++ b/new-lamassu-admin/src/components/ImagePopper.jsx @@ -1,4 +1,4 @@ -import { makeStyles, ClickAwayListener } from '@material-ui/core' +import { makeStyles, ClickAwayListener } from '@mui/material' 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 e0baa4fa..a91bfe3f 100644 --- a/new-lamassu-admin/src/components/InfoMessage.jsx +++ b/new-lamassu-admin/src/components/InfoMessage.jsx @@ -1,4 +1,4 @@ -import { Box, makeStyles } from '@material-ui/core' +import { Box, makeStyles } from '@mui/material' 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 47959cff..15df9448 100644 --- a/new-lamassu-admin/src/components/InformativeDialog.jsx +++ b/new-lamassu-admin/src/components/InformativeDialog.jsx @@ -1,4 +1,4 @@ -import { Dialog, DialogContent, makeStyles } from '@material-ui/core' +import { Dialog, DialogContent, makeStyles } from '@mui/material' 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 4bf5752a..64b1261e 100644 --- a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx +++ b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx @@ -1,5 +1,5 @@ import { useLazyQuery } from "@apollo/client"; -import { makeStyles, ClickAwayListener } from '@material-ui/core' +import { makeStyles, ClickAwayListener } from '@mui/material' 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 aba40236..47d43105 100644 --- a/new-lamassu-admin/src/components/Modal.jsx +++ b/new-lamassu-admin/src/components/Modal.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Modal as MaterialModal, Paper } from '@material-ui/core' +import { makeStyles, Modal as MaterialModal, Paper } from '@mui/material' 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 22756b3b..ab64af73 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 96c66dec..1d5bd06c 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 a933e39d..e751a0be 100644 --- a/new-lamassu-admin/src/components/Popper.jsx +++ b/new-lamassu-admin/src/components/Popper.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Popper as MaterialPopper, Paper } from '@material-ui/core' +import { makeStyles, Popper as MaterialPopper, Paper } from '@mui/material' 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 08219a96..df7a1d0d 100644 --- a/new-lamassu-admin/src/components/SearchBox.jsx +++ b/new-lamassu-admin/src/components/SearchBox.jsx @@ -1,7 +1,7 @@ -import InputBase from '@material-ui/core/InputBase' -import Paper from '@material-ui/core/Paper' -import { makeStyles } from '@material-ui/core/styles' -import MAutocomplete from '@material-ui/lab/Autocomplete' +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 classnames from 'classnames' import React, { memo, useState } from 'react' import { P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/SearchFilter.jsx b/new-lamassu-admin/src/components/SearchFilter.jsx index c35b4a71..c5ee45fc 100644 --- a/new-lamassu-admin/src/components/SearchFilter.jsx +++ b/new-lamassu-admin/src/components/SearchFilter.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' import Chip from 'src/components/Chip' import { P, Label3 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/Stage.jsx b/new-lamassu-admin/src/components/Stage.jsx index 0d93080b..b4425446 100644 --- a/new-lamassu-admin/src/components/Stage.jsx +++ b/new-lamassu-admin/src/components/Stage.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/Status.jsx b/new-lamassu-admin/src/components/Status.jsx index f1d8ff59..c215c4d4 100644 --- a/new-lamassu-admin/src/components/Status.jsx +++ b/new-lamassu-admin/src/components/Status.jsx @@ -1,5 +1,5 @@ -import Chip from '@material-ui/core/Chip' -import { makeStyles } from '@material-ui/core/styles' +import Chip from '@mui/material/Chip' +import { makeStyles } from '@mui/material/styles' import React from 'react' import { diff --git a/new-lamassu-admin/src/components/Stepper.jsx b/new-lamassu-admin/src/components/Stepper.jsx index f827ff4b..84f278ef 100644 --- a/new-lamassu-admin/src/components/Stepper.jsx +++ b/new-lamassu-admin/src/components/Stepper.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/Subtitle.jsx b/new-lamassu-admin/src/components/Subtitle.jsx index 89a12a6d..b095771f 100644 --- a/new-lamassu-admin/src/components/Subtitle.jsx +++ b/new-lamassu-admin/src/components/Subtitle.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/TableLabel.jsx b/new-lamassu-admin/src/components/TableLabel.jsx index a0b8815b..efddfa62 100644 --- a/new-lamassu-admin/src/components/TableLabel.jsx +++ b/new-lamassu-admin/src/components/TableLabel.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/styles' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React from 'react' diff --git a/new-lamassu-admin/src/components/Title.jsx b/new-lamassu-admin/src/components/Title.jsx index be96227b..90ee8c53 100644 --- a/new-lamassu-admin/src/components/Title.jsx +++ b/new-lamassu-admin/src/components/Title.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React, { memo } from 'react' import { spacer } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/components/Tooltip.jsx b/new-lamassu-admin/src/components/Tooltip.jsx index 1748c501..a11ecb7d 100644 --- a/new-lamassu-admin/src/components/Tooltip.jsx +++ b/new-lamassu-admin/src/components/Tooltip.jsx @@ -1,4 +1,4 @@ -import { makeStyles, ClickAwayListener } from '@material-ui/core' +import { makeStyles, ClickAwayListener } from '@mui/material' import * as R from 'ramda' import React, { useState, memo } from 'react' import Popper from 'src/components/Popper' diff --git a/new-lamassu-admin/src/components/Uptime.jsx b/new-lamassu-admin/src/components/Uptime.jsx index d91848de..48ed9072 100644 --- a/new-lamassu-admin/src/components/Uptime.jsx +++ b/new-lamassu-admin/src/components/Uptime.jsx @@ -1,5 +1,5 @@ -import { makeStyles } from '@material-ui/core' -import Chip from '@material-ui/core/Chip' +import { makeStyles } from '@mui/material' +import Chip from '@mui/material/Chip' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx index 132a2505..83eb6844 100644 --- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx +++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import { useFormikContext, Form, Formik, Field as FormikField } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.jsx b/new-lamassu-admin/src/components/buttons/ActionButton.jsx index 02d7d107..60de6619 100644 --- a/new-lamassu-admin/src/components/buttons/ActionButton.jsx +++ b/new-lamassu-admin/src/components/buttons/ActionButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/buttons/AddButton.jsx b/new-lamassu-admin/src/components/buttons/AddButton.jsx index 267ebaee..3d96d7c8 100644 --- a/new-lamassu-admin/src/components/buttons/AddButton.jsx +++ b/new-lamassu-admin/src/components/buttons/AddButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' diff --git a/new-lamassu-admin/src/components/buttons/Button.jsx b/new-lamassu-admin/src/components/buttons/Button.jsx index 5945170a..a9f2767c 100644 --- a/new-lamassu-admin/src/components/buttons/Button.jsx +++ b/new-lamassu-admin/src/components/buttons/Button.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/buttons/DeleteButton.jsx b/new-lamassu-admin/src/components/buttons/DeleteButton.jsx index 4be8a651..d5df9d7d 100644 --- a/new-lamassu-admin/src/components/buttons/DeleteButton.jsx +++ b/new-lamassu-admin/src/components/buttons/DeleteButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' import DeleteIcon from 'src/styling/icons/button/cancel/zodiac.svg?react' diff --git a/new-lamassu-admin/src/components/buttons/FeatureButton.jsx b/new-lamassu-admin/src/components/buttons/FeatureButton.jsx index 3fe97cd7..ec9bf8c7 100644 --- a/new-lamassu-admin/src/components/buttons/FeatureButton.jsx +++ b/new-lamassu-admin/src/components/buttons/FeatureButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/buttons/IDButton.jsx b/new-lamassu-admin/src/components/buttons/IDButton.jsx index a43aeb82..2cd14e80 100644 --- a/new-lamassu-admin/src/components/buttons/IDButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IDButton.jsx @@ -1,5 +1,5 @@ -import { ClickAwayListener } from '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { ClickAwayListener } from '@mui/material' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { useState, memo } from 'react' import Popover from 'src/components/Popper' diff --git a/new-lamassu-admin/src/components/buttons/IconButton.jsx b/new-lamassu-admin/src/components/buttons/IconButton.jsx index f208c25f..bb58cd97 100644 --- a/new-lamassu-admin/src/components/buttons/IconButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IconButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles, IconButton as IconB } from '@material-ui/core' +import { makeStyles, IconButton as IconB } from '@mui/material' import React from 'react' import { comet } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/components/buttons/Link.jsx b/new-lamassu-admin/src/components/buttons/Link.jsx index d8f7af7f..9b9ed90a 100644 --- a/new-lamassu-admin/src/components/buttons/Link.jsx +++ b/new-lamassu-admin/src/components/buttons/Link.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/buttons/Link.styles.js b/new-lamassu-admin/src/components/buttons/Link.styles.js index 0d05e9c1..0d7e54b4 100644 --- a/new-lamassu-admin/src/components/buttons/Link.styles.js +++ b/new-lamassu-admin/src/components/buttons/Link.styles.js @@ -1,4 +1,4 @@ -import { alpha } from '@material-ui/core/styles/colorManipulator' +import { alpha } from '@mui/material/styles/colorManipulator' import typographyStyles from 'src/components/typography/styles' import { diff --git a/new-lamassu-admin/src/components/buttons/SubpageButton.jsx b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx index f98b6d75..7c7cf456 100644 --- a/new-lamassu-admin/src/components/buttons/SubpageButton.jsx +++ b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React, { memo, useState } from 'react' import { H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx index 12329fd3..49b8ac94 100644 --- a/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx +++ b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' import InverseLinkIcon from 'src/styling/icons/action/external link/white.svg?react' import LinkIcon from 'src/styling/icons/action/external link/zodiac.svg?react' diff --git a/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx index 27a3a4fb..51b613e6 100644 --- a/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx +++ b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import { add, differenceInMonths, diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx index 75c68b9d..054f62ef 100644 --- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx +++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import { compareAsc, differenceInDays, set } from 'date-fns/fp' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/date-range-picker/Tile.jsx b/new-lamassu-admin/src/components/date-range-picker/Tile.jsx index 228d806f..d9614d0e 100644 --- a/new-lamassu-admin/src/components/date-range-picker/Tile.jsx +++ b/new-lamassu-admin/src/components/date-range-picker/Tile.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React from 'react' diff --git a/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx index 28852792..b35c52df 100644 --- a/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx +++ b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React, { useState, memo } from 'react' import { H4, P } from 'src/components/typography' import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react' diff --git a/new-lamassu-admin/src/components/editableTable/Header.jsx b/new-lamassu-admin/src/components/editableTable/Header.jsx index a6ef6143..0ebbf630 100644 --- a/new-lamassu-admin/src/components/editableTable/Header.jsx +++ b/new-lamassu-admin/src/components/editableTable/Header.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import * as R from 'ramda' import React, { useContext } from 'react' diff --git a/new-lamassu-admin/src/components/editableTable/Row.jsx b/new-lamassu-admin/src/components/editableTable/Row.jsx index 43d8dcc7..4ea2b7fb 100644 --- a/new-lamassu-admin/src/components/editableTable/Row.jsx +++ b/new-lamassu-admin/src/components/editableTable/Row.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/editableTable/Table.jsx b/new-lamassu-admin/src/components/editableTable/Table.jsx index 770b9449..52a7a62e 100644 --- a/new-lamassu-admin/src/components/editableTable/Table.jsx +++ b/new-lamassu-admin/src/components/editableTable/Table.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useState, useEffect } from 'react' diff --git a/new-lamassu-admin/src/components/fake-table/Table.jsx b/new-lamassu-admin/src/components/fake-table/Table.jsx index 5b6acaa7..31aba443 100644 --- a/new-lamassu-admin/src/components/fake-table/Table.jsx +++ b/new-lamassu-admin/src/components/fake-table/Table.jsx @@ -1,6 +1,6 @@ -import Card from '@material-ui/core/Card' -import CardContent from '@material-ui/core/CardContent' -import { makeStyles } from '@material-ui/core/styles' +import Card from '@mui/material/Card' +import CardContent from '@mui/material/CardContent' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import React from 'react' diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx index 84c4e1a1..20018c63 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx @@ -1,5 +1,5 @@ -import { Box } from '@material-ui/core' -import MAutocomplete from '@material-ui/lab/Autocomplete' +import { Box } from '@mui/material' +import MAutocomplete from '@mui/lab/Autocomplete' import sort from 'match-sorter' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx index c70cc699..8743782a 100644 --- a/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx @@ -1,7 +1,7 @@ -import Checkbox from '@material-ui/core/Checkbox' -import { makeStyles } from '@material-ui/core/styles' -import CheckBoxIcon from '@material-ui/icons/CheckBox' -import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank' +import Checkbox from '@mui/material/Checkbox' +import { makeStyles } from '@mui/material/styles' +import CheckBoxIcon from '@mui/icons-material/CheckBox' +import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank' import React from 'react' import { Label2, Info3 } from 'src/components/typography' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' diff --git a/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx b/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx index b694cbe1..0aaa2130 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 '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import React from 'react' import OtpInput from 'react-otp-input' diff --git a/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx b/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx index 3acac050..6e717900 100644 --- a/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx @@ -1,7 +1,7 @@ -import FormControl from '@material-ui/core/FormControl' -import InputLabel from '@material-ui/core/InputLabel' -import MenuItem from '@material-ui/core/MenuItem' -import Select from '@material-ui/core/Select' +import FormControl from '@mui/material/FormControl' +import InputLabel from '@mui/material/InputLabel' +import MenuItem from '@mui/material/MenuItem' +import Select from '@mui/material/Select' import classnames from 'classnames' import React from 'react' diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx index 48520a68..18ba493f 100644 --- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx +++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx @@ -3,7 +3,7 @@ import { RadioGroup as MRadioGroup, FormControlLabel, makeStyles -} from '@material-ui/core' +} from '@mui/material' 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 c56ad4af..329632ef 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 2f2cdf0f..8aa1f3c6 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 '@material-ui/core/Switch' -import { makeStyles } from '@material-ui/core/styles' +import Switch from '@mui/material/Switch' +import { makeStyles } from '@mui/material/styles' import React, { memo } from 'react' import { diff --git a/new-lamassu-admin/src/components/inputs/base/TextInput.jsx b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx index 9d75840a..93ddd83a 100644 --- a/new-lamassu-admin/src/components/inputs/base/TextInput.jsx +++ b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx @@ -1,5 +1,5 @@ -import { makeStyles } from '@material-ui/core' -import TextField from '@material-ui/core/TextField' +import { makeStyles } from '@mui/material' +import TextField from '@mui/material/TextField' import classnames from 'classnames' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx index 72193ce2..424770e4 100644 --- a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx +++ b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx @@ -1,6 +1,6 @@ -import { makeStyles } from '@material-ui/core' -import { ToggleButtonGroup as MUIToggleButtonGroup } from '@material-ui/lab' -import ToggleButton from '@material-ui/lab/ToggleButton' +import { makeStyles } from '@mui/material' +import { ToggleButtonGroup as MUIToggleButtonGroup } from '@mui/lab' +import ToggleButton from '@mui/lab/ToggleButton' import React from 'react' import { H4, P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx index 58bb8cf6..097f0636 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 f5016e67..34a1c919 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 99c62765..fdbf12e2 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 '@material-ui/core/ClickAwayListener' -import Popper from '@material-ui/core/Popper' -import { makeStyles } from '@material-ui/core/styles' +import ClickAwayListener from '@mui/material/ClickAwayListener' +import Popper from '@mui/material/Popper' +import { makeStyles } from '@mui/material/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 6f0e9302..538ec028 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 ff63bc08..055049cc 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 563bb275..67407f86 100644 --- a/new-lamassu-admin/src/components/layout/TitleSection.jsx +++ b/new-lamassu-admin/src/components/layout/TitleSection.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 d8a9740f..92b0942d 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 aae73bec..df0dcb9f 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 ccb22539..317e711e 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 b755c746..00443524 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 d7e92bd5..f46436d0 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 d99a4f50..d42b3eae 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 0318f055..bcdd1d89 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 f5b28256..32f23ad2 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 19616a7e..f900b4eb 100644 --- a/new-lamassu-admin/src/components/tables/DataTable.jsx +++ b/new-lamassu-admin/src/components/tables/DataTable.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 2cd0a09e..37a38a11 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 ed2c20ac..b7a4e07e 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Dialog, DialogContent, SvgIcon, IconButton } from '@mui/material' +import { makeStyles } from '@mui/material/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 ca52f7e1..0b717ce9 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box } from '@mui/material' +import { makeStyles } from '@mui/material/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 1222db8e..a0d419d3 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 cd5633ac..86c3b2f4 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Paper } from '@mui/material' +import { makeStyles } from '@mui/material/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 56b436cc..7259220e 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box } from '@mui/material' +import { makeStyles } from '@mui/material/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 b14bb2fe..e781f5a6 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box } from '@mui/material' +import { makeStyles } from '@mui/material/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 14353f77..da72bb23 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box } from '@mui/material' +import { makeStyles } from '@mui/material/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 a48e1a50..cdcec821 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box } from '@mui/material' +import { makeStyles } from '@mui/material/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 8ed79809..e790dbf6 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 071b6534..0b43c05f 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 1a98c069..5249bfc4 100644 --- a/new-lamassu-admin/src/pages/Authentication/Login.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Login.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Grid } from '@material-ui/core' +import { makeStyles, Grid } from '@mui/material' 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 571167e4..44a1da1b 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 '@material-ui/core/Paper' -import { makeStyles } from '@material-ui/core/styles' +import Paper from '@mui/material/Paper' +import { makeStyles } from '@mui/material/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 4bdd6a77..34f0d684 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 46b9a2f5..5292a89c 100644 --- a/new-lamassu-admin/src/pages/Authentication/Register.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx @@ -1,6 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Grid } from '@material-ui/core' -import Paper from '@material-ui/core/Paper' +import { makeStyles, Grid } from '@mui/material' +import Paper from '@mui/material/Paper' import { Field, Form, Formik } from 'formik' import React, { useReducer } from 'react' import { useLocation, useHistory } from 'react-router-dom' diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx index b9925d14..e924e7ae 100644 --- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx @@ -1,6 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Grid } from '@material-ui/core' -import Paper from '@material-ui/core/Paper' +import { makeStyles, Grid } from '@mui/material' +import Paper from '@mui/material/Paper' import { Form, Formik } from 'formik' import { QRCodeSVG as QRCode } from 'qrcode.react' import React, { useReducer, useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx index 27b82657..16ac3785 100644 --- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx +++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx @@ -1,6 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Grid } from '@material-ui/core' -import Paper from '@material-ui/core/Paper' +import { makeStyles, Grid } from '@mui/material' +import Paper from '@mui/material/Paper' import { Field, Form, Formik } from 'formik' import React, { useState } from 'react' import { useLocation, useHistory } from 'react-router-dom' diff --git a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx index 02b9f849..b56847d2 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 052d8d12..e417c029 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box, Dialog, DialogContent, DialogActions } from '@mui/material' +import { makeStyles } from '@mui/material/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 b29a3ad4..dc93c3d7 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 f84ea1cc..405f085b 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Box } from '@mui/material' +import { makeStyles } from '@mui/material/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 df1b64f8..872beef7 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 c64bda38..9bbf82df 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 0360ce66..8b12b3de 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 b654e479..8f15e98b 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 43934229..fa8d6645 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 7a1d77b8..17a19095 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 3213a544..71886a41 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 '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 dd05d1e6..dd80b721 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 ba0f0b25..417f8064 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Paper } from '@material-ui/core' +import { makeStyles, Paper } from '@mui/material' 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 173aef54..5aa9d4ed 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx @@ -6,8 +6,8 @@ import { DialogActions, DialogContent, Dialog -} from '@material-ui/core' -import NavigateNextIcon from '@material-ui/icons/NavigateNext' +} from '@mui/material' +import NavigateNextIcon from '@mui/icons-material/NavigateNext' import * as R from 'ramda' import React, { memo, useState } from 'react' import { useHistory, useParams } from 'react-router-dom' diff --git a/new-lamassu-admin/src/pages/Customers/Customers.jsx b/new-lamassu-admin/src/pages/Customers/Customers.jsx index 03f03b1f..0626ee3e 100644 --- a/new-lamassu-admin/src/pages/Customers/Customers.jsx +++ b/new-lamassu-admin/src/pages/Customers/Customers.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Box, makeStyles } from '@material-ui/core' +import { Box, makeStyles } from '@mui/material' 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 a34303a6..a53216c8 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 0d49f2b4..019e0318 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 2f13948c..42298345 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 77605881..04b9f0d0 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 f400e073..57afa313 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 e4e90871..57f5468d 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 bef6d6b0..82ae8b55 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { CardContent, Card, Grid } from '@mui/material' +import { makeStyles } from '@mui/material/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 ed15738d..ef540df2 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 10ee5ffa..5cb0a6c6 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Paper } from '@mui/material' +import { makeStyles } from '@mui/material/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 44ac023f..7b206d77 100644 --- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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/IdDataCard.jsx b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx index 12a838db..f7023eea 100644 --- a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx @@ -1,4 +1,4 @@ -import { Box } from '@material-ui/core' +import { Box } from '@mui/material' import { differenceInYears, format, parse } from 'date-fns/fp' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx index 0c88d50d..e38e075c 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 '@material-ui/core/ButtonBase' -import Paper from '@material-ui/core/Card' -import { makeStyles } from '@material-ui/core/styles' +import ButtonBase from '@mui/material/ButtonBase' +import Paper from '@mui/material/Card' +import { makeStyles } from '@mui/material/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 da4771c7..d84a65a0 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 cd592d0d..a16f5599 100644 --- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx @@ -1,5 +1,5 @@ import { toUnit } from '@lamassu/coins/lightUtils' -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 17bce94f..a0541697 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 65388602..0db848e5 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,4 @@ -import { makeStyles, Paper } from '@material-ui/core' +import { makeStyles, Paper } from '@mui/material' 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 5e36507e..75f172e6 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 3ce56ce3..8ca7123d 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,4 @@ -import { makeStyles, Paper } from '@material-ui/core' +import { makeStyles, Paper } from '@mui/material' 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 50da039c..96c5e908 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,4 @@ -import { makeStyles, Paper } from '@material-ui/core' +import { makeStyles, Paper } from '@mui/material' 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 9db47b44..9ad6c2f9 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 '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Paper } from '@mui/material' +import { makeStyles } from '@mui/material/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 86285b94..7d9f5a7e 100644 --- a/new-lamassu-admin/src/pages/Customers/helper.jsx +++ b/new-lamassu-admin/src/pages/Customers/helper.jsx @@ -1,5 +1,5 @@ import React from 'react' -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 46fe3c5e..caac5087 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 '@material-ui/core/Button' -import Grid from '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Button from '@mui/material/Button' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 c0e8e70b..9792809e 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx +++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx @@ -1,6 +1,6 @@ -import { makeStyles } from '@material-ui/core' -import List from '@material-ui/core/List' -import ListItem from '@material-ui/core/ListItem' +import { makeStyles } from '@mui/material' +import List from '@mui/material/List' +import ListItem from '@mui/material/ListItem' import * as R from 'ramda' import React from 'react' import { useHistory } from 'react-router-dom' diff --git a/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx b/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx index 96dd647b..03ef83d1 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 '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 5c1bcf3e..0d620de1 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx +++ b/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx @@ -1,6 +1,6 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' -import Grid from '@material-ui/core/Grid' +import { makeStyles } from '@mui/material' +import Grid from '@mui/material/Grid' import BigNumber from 'bignumber.js' import classnames from 'classnames' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx b/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx index 6a393082..b6aa96f9 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 '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 6a680427..ec550e93 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 '@material-ui/core/Button' -import Grid from '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Button from '@mui/material/Button' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 a88abcf6..8901348a 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 e7054191..fa61bc28 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 75a36b40..0f88551a 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 '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 e943d991..eafb7421 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx @@ -1,11 +1,11 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles, withStyles } from '@material-ui/core' -import Table from '@material-ui/core/Table' -import TableBody from '@material-ui/core/TableBody' -import TableCell from '@material-ui/core/TableCell' -import TableContainer from '@material-ui/core/TableContainer' -import TableHead from '@material-ui/core/TableHead' -import TableRow from '@material-ui/core/TableRow' +import { makeStyles, withStyles } from '@mui/material' +import Table from '@mui/material/Table' +import TableBody from '@mui/material/TableBody' +import TableCell from '@mui/material/TableCell' +import TableContainer from '@mui/material/TableContainer' +import TableHead from '@mui/material/TableHead' +import TableRow from '@mui/material/TableRow' import classnames from 'classnames' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx index c172d3c6..85b60a38 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 '@material-ui/core/Button' -import Grid from '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' +import Button from '@mui/material/Button' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/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 d18877da..871ec653 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 71c5a221..2cb03f79 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 775b54bf..539754d2 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 8edc1f81..e10d71a5 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 2dbdb124..a002f5df 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 60f44b67..d29a59e1 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 a5bc9f31..2bdc1d5b 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 eda98e95..66f7b28e 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 1be5ef28..dcd12d52 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 b3fb1a7f..9e8f4a1c 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 615f1ca1..a72247a2 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,4 @@ -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 3f013c7c..2f9e4820 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 6a0a2927..0fbec6c4 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 '@material-ui/core/List' -import ListItem from '@material-ui/core/ListItem' -import ListItemText from '@material-ui/core/ListItemText' -import { makeStyles } from '@material-ui/core/styles' +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 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 0dda4d10..674a8df7 100644 --- a/new-lamassu-admin/src/pages/Machines/Machines.jsx +++ b/new-lamassu-admin/src/pages/Machines/Machines.jsx @@ -1,8 +1,8 @@ import { useQuery, gql } from "@apollo/client"; -import Breadcrumbs from '@material-ui/core/Breadcrumbs' -import Grid from '@material-ui/core/Grid' -import { makeStyles } from '@material-ui/core/styles' -import NavigateNextIcon from '@material-ui/icons/NavigateNext' +import Breadcrumbs from '@mui/material/Breadcrumbs' +import Grid from '@mui/material/Grid' +import { makeStyles } from '@mui/material/styles' +import NavigateNextIcon from '@mui/icons-material/NavigateNext' import classnames from 'classnames' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx index 82be3f52..4c7b3c15 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 6f50a78d..793e40df 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { DialogActions, makeStyles, Box } from '@material-ui/core' +import { DialogActions, makeStyles, Box } from '@mui/material' 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 1a6c0e88..cea17f48 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import BigNumber from 'bignumber.js' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx index dad71c89..e77c5726 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx @@ -1,5 +1,5 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React from 'react' // import * as Yup from 'yup' diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx index 14e029d5..49edc5be 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx @@ -1,5 +1,5 @@ -import { Grid /*, Divider */ } from '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' +import { Grid /*, Divider */ } from '@mui/material' +import { makeStyles } from '@mui/material/styles' import BigNumber from 'bignumber.js' import React from 'react' diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js index 5b5222e5..20f05896 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.styles.js @@ -1,4 +1,4 @@ -import { alpha } from '@material-ui/core/styles/colorManipulator' +import { alpha } from '@mui/material/styles/colorManipulator' import { detailsRowStyles, diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx index cdff0572..adc31043 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx @@ -1,5 +1,5 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import { formatDistance } from 'date-fns' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx index 549b798b..58c82858 100644 --- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' import { H1, P, Info2 } from 'src/components/typography' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx index 3b1ccab5..09dce4b2 100644 --- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' 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 16aec872..39de01cd 100644 --- a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx +++ b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' 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 35917013..d66234a5 100644 --- a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx +++ b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import { useFormikContext, Field as FormikField } from 'formik' import React from 'react' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx index 5a81bf34..5af68822 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx +++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React, { useContext } from 'react' import NotificationsCtx from '../NotificationsContext' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx index b3461aab..54cca64d 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useContext } from 'react' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx index 67ad5c7a..d6160c46 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 edb58b73..0f3f189c 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 33e4b487..00f9e094 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 fbac6725..3d459147 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 759108b2..9fb89c49 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 '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 09e00eed..3a729e98 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Paper } from '@material-ui/core' +import { makeStyles, Paper } from '@mui/material' 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 b5faa683..4b0681b8 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Chip } from '@material-ui/core' +import { makeStyles, Chip } from '@mui/material' import { Form, Formik, Field } from 'formik' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx index 5d9a0e0c..9f342b0f 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 '@material-ui/core' +import { makeStyles } from '@mui/material' 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 b66f3ec6..939b42fc 100644 --- a/new-lamassu-admin/src/pages/ServerLogs.jsx +++ b/new-lamassu-admin/src/pages/ServerLogs.jsx @@ -1,5 +1,5 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState, useRef } from 'react' import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper' diff --git a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx index 80f1e4ce..6495f88e 100644 --- a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx +++ b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Grid } from '@material-ui/core' +import { makeStyles, Grid } from '@mui/material' import classnames from 'classnames' import { Formik, Form, FastField } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Services/Services.jsx b/new-lamassu-admin/src/pages/Services/Services.jsx index fdbf2234..1ec790c4 100644 --- a/new-lamassu-admin/src/pages/Services/Services.jsx +++ b/new-lamassu-admin/src/pages/Services/Services.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Grid } from '@material-ui/core' +import { makeStyles, Grid } from '@mui/material' 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 32ccb5b5..a4302542 100644 --- a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx +++ b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/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 805ca6b9..4d37cc51 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx @@ -1,6 +1,6 @@ import { useLazyQuery, useMutation, gql } from "@apollo/client"; import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils' -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' import BigNumber from 'bignumber.js' import classNames from 'classnames' import { add, differenceInYears, format, sub, parse } from 'date-fns/fp' diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx index 49bbf39e..453ac8ac 100644 --- a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx +++ b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx @@ -1,6 +1,6 @@ import { useQuery, gql } from "@apollo/client"; import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils' -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import BigNumber from 'bignumber.js' import * as R from 'ramda' import React, { useEffect, useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx index c21291be..97947e42 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx @@ -1,5 +1,5 @@ import { useMutation, useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' 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 9d056395..a92d8686 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import React from 'react' import { Label1, Info2 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx index 91f66b19..f97eb34e 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import { Field, useFormikContext, FieldArray } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx index 49985224..e82da9a0 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx index f5baec02..90401d32 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx index e4d75857..daf1d718 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx index 17352b54..eb8405b7 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' import { H1, P } from 'src/components/typography' import CustomReqLogo from 'src/styling/icons/compliance/custom-requirement.svg?react' diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx index 1af0c181..9c80f447 100644 --- a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx +++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import { H2 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Triggers/Triggers.jsx b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx index 6039aa4e..7da853f6 100644 --- a/new-lamassu-admin/src/pages/Triggers/Triggers.jsx +++ b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' 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 4b0b0002..577063dd 100644 --- a/new-lamassu-admin/src/pages/Triggers/Wizard.jsx +++ b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' 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 a0e613ee..429c6255 100644 --- a/new-lamassu-admin/src/pages/Triggers/helper.jsx +++ b/new-lamassu-admin/src/pages/Triggers/helper.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx index 0bf36870..cde4ee00 100644 --- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client"; -import { makeStyles, Box, Chip } from '@material-ui/core' +import { makeStyles, Box, Chip } from '@mui/material' 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 9254b6a1..ddaae2ad 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React, { useState } from 'react' import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx index 729fcb14..9334f76a 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import classnames from 'classnames' import { Field, Form, Formik } from 'formik' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx index b5f62c9b..68e24db9 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React, { useState } from 'react' import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx index 1580abb0..812c3de8 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React from 'react' import Modal from 'src/components/Modal' import { Info2, P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx index 112356fe..f764245e 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx @@ -1,5 +1,5 @@ import { useLazyQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import { Form, Formik } from 'formik' import React, { useState } from 'react' import Modal from 'src/components/Modal' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx index 7add5e02..d2864067 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React, { useEffect, useState } from 'react' import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx b/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx index ae9f209a..69e559bc 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx +++ b/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core/styles' +import { makeStyles } from '@mui/material/styles' import React, { useEffect, useState } from 'react' import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.jsx b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx index 6e3986ce..3406caee 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wallet.jsx +++ b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import Modal from 'src/components/Modal' diff --git a/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx index cae7a4e2..215a92df 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx +++ b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' import { H1, P } from 'src/components/typography' import BitcoinLogo from 'src/styling/logos/icon-bitcoin-colour.svg?react' diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx index 3070b1f4..d8d5f39a 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx +++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' 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 00e2b954..9733690d 100644 --- a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx +++ b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx @@ -1,5 +1,5 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles, Dialog, DialogContent } from '@material-ui/core' +import { makeStyles, Dialog, DialogContent } from '@mui/material' import classnames from 'classnames' import React, { useState, useContext } from 'react' import { useHistory } from 'react-router-dom' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx b/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx index f61e8a9d..2336115a 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React from 'react' import Section from 'src/components/layout/Section' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx index 41a88813..aaa78837 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx @@ -1,4 +1,4 @@ -import { makeStyles, Drawer, Grid } from '@material-ui/core' +import { makeStyles, Drawer, Grid } from '@mui/material' 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 37d39166..e3756df0 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React from 'react' import Section from 'src/components/layout/Section' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx index e26a8473..ed619c28 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx @@ -1,5 +1,5 @@ import { useMutation, useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React, { useState, useEffect } from 'react' import { H4, Info3 } from 'src/components/typography' import FormRenderer from 'src/pages/Services/FormRenderer' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx index 7454fd21..014b00fc 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx @@ -1,5 +1,5 @@ -import { makeStyles } from '@material-ui/core' -import Grid from '@material-ui/core/Grid' +import { makeStyles } from '@mui/material' +import Grid from '@mui/material/Grid' import React, { useState } from 'react' import Sidebar from 'src/components/layout/Sidebar' import TitleSection from 'src/components/layout/TitleSection' diff --git a/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx b/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx index 7948bb98..f85f19e6 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' // import OperatorInfo from 'src/pages/OperatorInfo' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx index 972f091f..fed8b74a 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx @@ -1,5 +1,5 @@ import { useMutation, useQuery, gql } from "@apollo/client"; -import { makeStyles, Box } from '@material-ui/core' +import { makeStyles, Box } from '@mui/material' import classnames from 'classnames' import React, { useState } from 'react' import InfoMessage from 'src/components/InfoMessage' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx index 9d66c75a..0cb3318f 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import { P, H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx index f3247ba3..a9c79015 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx @@ -1,5 +1,5 @@ import { useMutation, useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React, { useState } from 'react' import { P, H4 } from 'src/components/typography' import FormRenderer from 'src/pages/Services/FormRenderer' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx index 18bbd6c2..949f7f7c 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx @@ -1,5 +1,5 @@ import { useQuery, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import { Formik, Form, Field } from 'formik' import React, { useState } from 'react' import PromptWhenDirty from 'src/components/PromptWhenDirty' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx index 8618cb28..dfac3102 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx @@ -1,6 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { getEquivalentCode } from '@lamassu/coins/lightUtils' -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import { H4, Info3 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx index e9c0154a..6a9c14ed 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx @@ -1,6 +1,6 @@ import { useQuery, gql } from "@apollo/client"; import { getEquivalentCode } from '@lamassu/coins/lightUtils' -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import { H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx index ac0bb812..2a40f8fc 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import { H4, Info3 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx index b55ecf15..02afcb08 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import * as R from 'ramda' import React, { useState } from 'react' import Sidebar, { Stepper } from 'src/components/layout/Sidebar' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx b/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx index ebe87a41..fb6014e2 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core' +import { makeStyles } from '@mui/material' import React from 'react' import { H1, P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/routing/routes.jsx b/new-lamassu-admin/src/routing/routes.jsx index 26afcbe7..e3d7aeaf 100644 --- a/new-lamassu-admin/src/routing/routes.jsx +++ b/new-lamassu-admin/src/routing/routes.jsx @@ -1,6 +1,6 @@ -import Fade from '@material-ui/core/Fade' -import Slide from '@material-ui/core/Slide' -import { makeStyles } from '@material-ui/core/styles' +import Fade from '@mui/material/Fade' +import Slide from '@mui/material/Slide' +import { makeStyles } from '@mui/material/styles' import * as R from 'ramda' import React, { useContext } from 'react' import { diff --git a/new-lamassu-admin/src/styling/theme.js b/new-lamassu-admin/src/styling/theme.js index 7567131e..db730113 100644 --- a/new-lamassu-admin/src/styling/theme.js +++ b/new-lamassu-admin/src/styling/theme.js @@ -1,4 +1,4 @@ -import { createTheme } from '@material-ui/core/styles' +import { createTheme } from '@mui/material/styles' import typographyStyles from 'src/components/typography/styles' From 86e3401cc8090984852274eee0034076a0386bd8 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 15 Apr 2025 12:09:45 +0100 Subject: [PATCH 02/10] partial: first codemod --- new-lamassu-admin/src/App.jsx | 17 +- .../BooleanPropertiesTable.jsx | 7 +- .../src/components/editableTable/Row.jsx | 8 +- .../components/inputs/base/Autocomplete.jsx | 4 +- .../single-row-table/SingleRowTable.jsx | 4 +- .../src/pages/AddMachine/AddMachine.jsx | 4 +- .../src/pages/Authentication/Login.jsx | 4 +- .../src/pages/Authentication/Register.jsx | 4 +- .../src/pages/Authentication/Reset2FA.jsx | 4 +- .../pages/Authentication/ResetPassword.jsx | 4 +- .../src/pages/Blacklist/BlacklistAdvanced.jsx | 6 +- .../src/pages/Blacklist/BlacklistTable.jsx | 3 +- .../src/pages/Customers/helper.jsx | 4 +- .../LoyaltyPanel/IndividualDiscounts.jsx | 3 +- .../src/pages/LoyaltyPanel/PromoCodes.jsx | 3 +- .../src/pages/Maintenance/CashUnits.jsx | 291 +++++++++--------- .../src/pages/Maintenance/helper.jsx | 5 +- .../Notifications/components/EditHeader.jsx | 5 +- .../src/pages/OperatorInfo/ContactInfo.jsx | 5 +- .../OperatorInfo/SMSNotices/SMSNotices.jsx | 6 +- .../pages/OperatorInfo/TermsConditions.jsx | 5 +- .../src/pages/Services/schemas/bitgo.js | 2 +- .../src/pages/Services/schemas/galoy.js | 2 +- .../SessionManagement/SessionManagement.jsx | 3 +- .../pages/Transactions/CopyToClipboard.jsx | 2 +- .../CustomInfoRequests/CustomInfoRequests.jsx | 227 +++++++------- .../src/pages/Triggers/components/helper.js | 2 +- .../src/pages/Wallet/WizardStep.jsx | 4 +- .../src/pages/Wizard/components/Footer.jsx | 14 +- new-lamassu-admin/src/styling/theme.js | 6 +- 30 files changed, 335 insertions(+), 323 deletions(-) diff --git a/new-lamassu-admin/src/App.jsx b/new-lamassu-admin/src/App.jsx index e8f72672..b17facf0 100644 --- a/new-lamassu-admin/src/App.jsx +++ b/new-lamassu-admin/src/App.jsx @@ -6,8 +6,9 @@ import { StylesProvider, jssPreset, MuiThemeProvider, - makeStyles -} from '@mui/material/styles' + StyledEngineProvider, + makeStyles, +} from '@mui/material/styles'; import { create } from 'jss' import extendJss from 'jss-plugin-extend' import React, { useContext, useState } from 'react' @@ -153,15 +154,17 @@ const App = () => { - - -
- + + + +
+ + - ) + ); } export default App diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx index 83eb6844..2f533454 100644 --- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx +++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx @@ -86,7 +86,8 @@ const BooleanPropertiesTable = memo( ) : ( setEditing(true)}> + onClick={() => setEditing(true)} + size="large"> {disabled ? : } )} @@ -121,11 +122,11 @@ const BooleanPropertiesTable = memo( - ) + ); }} - ) + ); } ) diff --git a/new-lamassu-admin/src/components/editableTable/Row.jsx b/new-lamassu-admin/src/components/editableTable/Row.jsx index 4ea2b7fb..90afd4bc 100644 --- a/new-lamassu-admin/src/components/editableTable/Row.jsx +++ b/new-lamassu-admin/src/components/editableTable/Row.jsx @@ -77,7 +77,8 @@ const ActionCol = ({ disabled, editing }) => { onEdit && onEdit(values.id)}> + onClick={() => onEdit && onEdit(values.id)} + size="large"> {disableEdit ? : } @@ -88,7 +89,8 @@ const ActionCol = ({ disabled, editing }) => { disabled={disabled} onClick={() => { setDeleteDialog(true) - }}> + }} + size="large"> {disabled ? : } { )} - ) + ); } const ECol = ({ editing, focus, config, extraPaddingRight, extraPadding }) => { diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx index 20018c63..ffd90428 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx @@ -114,7 +114,7 @@ const Autocomplete = ({ ) @@ -134,7 +134,7 @@ const Autocomplete = ({ ) }} /> - ) + ); } export default Autocomplete 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 317e711e..ec9dd9b9 100644 --- a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx +++ b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx @@ -33,7 +33,7 @@ const SingleRowTable = ({ {title} - + @@ -62,7 +62,7 @@ const SingleRowTable = ({ - ) + ); } export default SingleRowTable diff --git a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx index b7a4e07e..9e78eefb 100644 --- a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx +++ b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx @@ -252,7 +252,7 @@ const AddMachine = memo(({ close, onPaired }) => {
Add Machine - + @@ -279,7 +279,7 @@ const AddMachine = memo(({ close, onPaired }) => {
- ) + ); }) export default AddMachine diff --git a/new-lamassu-admin/src/pages/Authentication/Login.jsx b/new-lamassu-admin/src/pages/Authentication/Login.jsx index 5249bfc4..e11a1454 100644 --- a/new-lamassu-admin/src/pages/Authentication/Login.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Login.jsx @@ -15,13 +15,13 @@ const Login = () => { spacing={0} direction="column" alignItems="center" - justify="center" + justifyContent="center" className={classes.welcomeBackground}> - ) + ); } export default Login diff --git a/new-lamassu-admin/src/pages/Authentication/Register.jsx b/new-lamassu-admin/src/pages/Authentication/Register.jsx index 5292a89c..ec4f779e 100644 --- a/new-lamassu-admin/src/pages/Authentication/Register.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx @@ -131,7 +131,7 @@ const Register = () => { spacing={0} direction="column" alignItems="center" - justify="center" + justifyContent="center" className={classes.welcomeBackground}>
@@ -214,7 +214,7 @@ const Register = () => {
- ) + ); } export default Register diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx index e924e7ae..4b1441fa 100644 --- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx @@ -121,7 +121,7 @@ const Reset2FA = () => { spacing={0} direction="column" alignItems="center" - justify="center" + justifyContent="center" className={classes.welcomeBackground}>
@@ -205,7 +205,7 @@ const Reset2FA = () => {
- ) + ); } export default Reset2FA diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx index 16ac3785..1f741ff9 100644 --- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx +++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx @@ -96,7 +96,7 @@ const ResetPassword = () => { spacing={0} direction="column" alignItems="center" - justify="center" + justifyContent="center" className={classes.welcomeBackground}>
@@ -164,7 +164,7 @@ const ResetPassword = () => {
- ) + ); } export default ResetPassword diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx index dc93c3d7..4574f27e 100644 --- a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx +++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx @@ -64,7 +64,8 @@ const BlacklistAdvanced = ({ view: it => ( setSelectedMessage(it)}> + onClick={() => setSelectedMessage(it)} + size="large"> ) @@ -81,7 +82,8 @@ const BlacklistAdvanced = ({ disabled={ !R.isNil(R.path(['allowToggle'], it)) && !R.path(['allowToggle'], it) - }> + } + size="large"> {R.path(['allowToggle'], it) ? ( ) : ( diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx index 872beef7..6f7852bd 100644 --- a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx +++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx @@ -49,7 +49,8 @@ const BlacklistTable = ({ onClick={() => { setDeleteDialog(true) setToBeDeleted(it) - }}> + }} + size="large"> ) diff --git a/new-lamassu-admin/src/pages/Customers/helper.jsx b/new-lamassu-admin/src/pages/Customers/helper.jsx index 7d9f5a7e..7e3902cc 100644 --- a/new-lamassu-admin/src/pages/Customers/helper.jsx +++ b/new-lamassu-admin/src/pages/Customers/helper.jsx @@ -317,7 +317,7 @@ const ManualDataEntry = ({ selectedValues, customInfoRequirementOptions }) => { fullWidth label={`Available requests`} className={classes.picker} - getOptionSelected={R.eqProps('code')} + isOptionEqualToValue={R.eqProps('code')} labelProp={'display'} options={customInfoRequirementOptions} onChange={(evt, it) => {}} @@ -343,7 +343,7 @@ const ManualDataEntry = ({ selectedValues, customInfoRequirementOptions }) => { }> )} - ) + ); } const customElements = { diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx index e10d71a5..d045afc9 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx @@ -144,7 +144,8 @@ const IndividualDiscounts = () => { onClick={() => { setDeleteDialog(true) setToBeDeleted({ variables: { discountId: t.id } }) - }}> + }} + size="large"> ) diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx index a002f5df..a63c0ffc 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx @@ -120,7 +120,8 @@ const PromoCodes = () => { onClick={() => { setDeleteDialog(true) setToBeDeleted({ variables: { codeId: t.id } }) - }}> + }} + size="large"> ) diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx index 793e40df..c8338af5 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx @@ -200,158 +200,155 @@ const CashCassettes = () => { /> ) - return ( - !dataLoading && ( - <> - R.path(['cashboxBatchesCsv'])(logs)} - timezone={timezone} - args={{ timezone }} - /> - ) : ( - <> - ) - } - ]} - iconClassName={classes.listViewButton} - className={classes.tableWidth} - appendix={ - -

- For details on configuring cash boxes and cassettes, please read - the relevant knowledgebase article: + return (!dataLoading && (<> + R.path(['cashboxBatchesCsv'])(logs)} + timezone={timezone} + args={{ timezone }} + /> + ) : ( + <> + ) + } + ]} + iconClassName={classes.listViewButton} + className={classes.tableWidth} + appendix={ + +

+ For details on configuring cash boxes and cassettes, please read + the relevant knowledgebase article: +

+ + + }> + {!showHistory && ( + + Cash box resets + + {cashboxReset && ( +

+ {onlyFirstToUpper(cashboxReset)}

- - - }> - {!showHistory && ( - - Cash box resets - - {cashboxReset && ( -

- {onlyFirstToUpper(cashboxReset)} -

- )} - setEditingSchema(true)} - className={classes.button}> - - - - - )} - - {!showHistory && ( - <> - - - {data && R.isEmpty(machines) && ( - )} - - )} - {showHistory && ( - - )} - setEditingSchema(true)} + className={classes.button} + size="large"> + + + + + )} + + {!showHistory && ( + <> + - {wizard && ( - { - setWizard(false) - }} - error={error?.message} - save={onSave} - locale={locale} - /> - )} - {editingSchema && ( - setEditingSchema(null)} - open={true}> -

- We can automatically assume you emptied a bill validator's cash - box when the machine detects that it has been removed. -

- -

- Assume the cash box is emptied whenever it's removed, creating a - new batch on the history screen and setting its current balance to - zero. -

- -

- Cash boxes won't be assumed emptied when removed, nor their counts - modified. Instead, to update the count and create a new batch, - you'll click the 'Edit' button on this panel. -

- - - - + + {data && R.isEmpty(machines) && ( + )} - ) - ) + )} + {showHistory && ( + + )} + + {wizard && ( + { + setWizard(false) + }} + error={error?.message} + save={onSave} + locale={locale} + /> + )} + {editingSchema && ( + setEditingSchema(null)} + open={true}> +

+ We can automatically assume you emptied a bill validator's cash + box when the machine detects that it has been removed. +

+ +

+ Assume the cash box is emptied whenever it's removed, creating a + new batch on the history screen and setting its current balance to + zero. +

+ +

+ Cash boxes won't be assumed emptied when removed, nor their counts + modified. Instead, to update the count and create a new batch, + you'll click the 'Edit' button on this panel. +

+ + + + + )} + )); } export default CashCassettes diff --git a/new-lamassu-admin/src/pages/Maintenance/helper.jsx b/new-lamassu-admin/src/pages/Maintenance/helper.jsx index acc6ef1e..19e21f60 100644 --- a/new-lamassu-admin/src/pages/Maintenance/helper.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/helper.jsx @@ -132,10 +132,11 @@ const getElements = ( onClick={() => { !R.isNil(setMachineId) && setMachineId(m.id ?? m.deviceId) setWizard(true) - }}> + }} + size="large"> - ) + ); } } ] diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx index 39de01cd..45b6c744 100644 --- a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx +++ b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx @@ -20,7 +20,8 @@ const Header = ({ title, editing, disabled, setEditing }) => { setEditing(true)} className={classes.button} - disabled={disabled}> + disabled={disabled} + size="large"> {disabled ? : } )} @@ -35,7 +36,7 @@ const Header = ({ title, editing, disabled, setEditing }) => {
)} - ) + ); } export default Header diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx index 00f9e094..7e5d288c 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx @@ -221,7 +221,8 @@ const ContactInfo = ({ wizard }) => { {!editing && ( setEditing(true)}> + onClick={() => setEditing(true)} + size="large"> )} @@ -311,7 +312,7 @@ const ContactInfo = ({ wizard }) => { )} - ) + ); } export default ContactInfo diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx index 3a729e98..3c73dc0b 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx @@ -180,7 +180,8 @@ const SMSNotices = () => { setPreviewOpen(false) setSelectedSMS(it) setShowModal(true) - }}> + }} + size="large"> ) @@ -221,7 +222,8 @@ const SMSNotices = () => { R.equals(selectedSMS, it) ? setPreviewOpen(!previewOpen) : setPreviewOpen(true) - }}> + }} + size="large"> {R.equals(selectedSMS, it) && previewOpen ? ( ) : ( diff --git a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx index 9f342b0f..e6b4519c 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx @@ -233,7 +233,8 @@ const TermsConditions = () => { {!editing && ( setEditing(true)}> + onClick={() => setEditing(true)} + size="large"> )} @@ -287,7 +288,7 @@ const TermsConditions = () => { )} - ) + ); } export default TermsConditions diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js index c440e60d..07c2705b 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js +++ b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js @@ -144,6 +144,6 @@ export default { environment: Yup.string('The environment must be a string') .matches(/(prod|test)/) .required('The environment is required') - }) + }); } } diff --git a/new-lamassu-admin/src/pages/Services/schemas/galoy.js b/new-lamassu-admin/src/pages/Services/schemas/galoy.js index 1ecedbfb..d98a07f4 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/galoy.js +++ b/new-lamassu-admin/src/pages/Services/schemas/galoy.js @@ -57,6 +57,6 @@ export default { endpoint: Yup.string('The endpoint must be a string') .max(100, 'The endpoint is too long') .required('The endpoint is required') - }) + }); } } diff --git a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx index 671eb3ad..a9fb8d23 100644 --- a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx +++ b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx @@ -98,7 +98,8 @@ const SessionManagement = () => { { deleteSession({ variables: { sid: s.sid } }) - }}> + }} + size="large"> ) diff --git a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx index a4302542..12ca1097 100644 --- a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx +++ b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx @@ -71,7 +71,7 @@ const CopyToClipboard = ({ )} - ) + ); } export default CopyToClipboard diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx index 97947e42..31d3a9ef 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx @@ -178,121 +178,118 @@ const CustomInfoRequests = ({ ) - return ( - !configLoading && ( - <> - {customRequests.length > 0 && ( - it.customRequest.name - }, - { - header: 'Data entry type', - width: 300, - textAlign: 'left', - size: 'sm', - view: it => inputTypeDisplay[it.customRequest.input.type] - }, - { - header: 'Constraints', - width: 300, - textAlign: 'left', - size: 'sm', - view: it => - constraintTypeDisplay[it.customRequest.input.constraintType] - }, - { - header: 'Edit', - width: 100, - textAlign: 'center', - size: 'sm', - view: it => { - return ( - { - setToBeEdited(it) - return toggleWizard() - }}> - - - ) - } - }, - { - header: 'Delete', - width: 100, - textAlign: 'center', - size: 'sm', - view: it => { - return ( - { - setToBeDeleted(it.id) - return setDeleteDialog(true) - }}> - - - ) - } - } - ]} - data={customRequests} - Details={DetailsRow} - expandable - rowSize="sm" - /> - )} - {!customRequests.length && ( -
- - It seems you haven't added any custom information requests yet. - - - Please read our{' '} - - Support Article - {' '} - on Compliance before adding new information requests. - - -
- )} - {showWizard && ( - { - setToBeEdited(null) - setHasError(false) - toggleWizard() - }} - toBeEdited={toBeEdited} - onSave={(...args) => handleSave(...args)} - existingRequirements={customRequests} - /> - )} - - { - setDeleteDialog(false) - setHasError(false) - }} - item={`custom information request`} - extraMessage={detailedDeleteMsg} - onConfirmed={() => handleDelete(toBeDeleted)} - /> - - ) - ) + return (!configLoading && (<> + {customRequests.length > 0 && ( + it.customRequest.name + }, + { + header: 'Data entry type', + width: 300, + textAlign: 'left', + size: 'sm', + view: it => inputTypeDisplay[it.customRequest.input.type] + }, + { + header: 'Constraints', + width: 300, + textAlign: 'left', + size: 'sm', + view: it => + constraintTypeDisplay[it.customRequest.input.constraintType] + }, + { + header: 'Edit', + width: 100, + textAlign: 'center', + size: 'sm', + view: it => { + return ( + { + setToBeEdited(it) + return toggleWizard() + }} + size="large"> + + + ); + } + }, + { + header: 'Delete', + width: 100, + textAlign: 'center', + size: 'sm', + view: it => { + return ( + { + setToBeDeleted(it.id) + return setDeleteDialog(true) + }} + size="large"> + + + ); + } + } + ]} + data={customRequests} + Details={DetailsRow} + expandable + rowSize="sm" + /> + )} + {!customRequests.length && ( +
+ + It seems you haven't added any custom information requests yet. + + + Please read our{' '} + + Support Article + {' '} + on Compliance before adding new information requests. + + +
+ )} + {showWizard && ( + { + setToBeEdited(null) + setHasError(false) + toggleWizard() + }} + toBeEdited={toBeEdited} + onSave={(...args) => handleSave(...args)} + existingRequirements={customRequests} + /> + )} + { + setDeleteDialog(false) + setHasError(false) + }} + item={`custom information request`} + extraMessage={detailedDeleteMsg} + onConfirmed={() => handleDelete(toBeDeleted)} + /> + )); } export default CustomInfoRequests diff --git a/new-lamassu-admin/src/pages/Triggers/components/helper.js b/new-lamassu-admin/src/pages/Triggers/components/helper.js index f1ab47b3..70ab864f 100644 --- a/new-lamassu-admin/src/pages/Triggers/components/helper.js +++ b/new-lamassu-admin/src/pages/Triggers/components/helper.js @@ -63,7 +63,7 @@ const getOverridesSchema = (values, customInfoRequests) => { .label('Automation') .matches(/(Manual|Automatic)/) .required() - }) + }); } const getDefaultSettings = () => { diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx index d8d5f39a..c3a0c270 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx +++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx @@ -165,7 +165,7 @@ const WizardStep = ({ fullWidth label={`Select ${displayName}`} className={classes.picker} - getOptionSelected={R.eqProps('code')} + isOptionEqualToValue={R.eqProps('code')} labelProp={'display'} options={unfilled} onChange={(evt, it) => { @@ -194,7 +194,7 @@ const WizardStep = ({ )} - ) + ); } export default WizardStep diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx index aaa78837..f4394a4e 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx @@ -52,13 +52,13 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) { variant={'persistent'} classes={{ paperAnchorDockedBottom: classes.drawer }}>
- +

Setup Lamassu Admin

{subtitle} @@ -69,7 +69,7 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) { xs={4} container direction="column" - justify="flex-start" + justifyContent="flex-start" alignItems="flex-end" spacing={5}> @@ -83,14 +83,14 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) { { @@ -104,7 +104,7 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) { xs={4} container direction="column" - justify="flex-start" + justifyContent="flex-start" alignItems="flex-end" spacing={5}> @@ -129,7 +129,7 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) { - ) + ); } export default Footer diff --git a/new-lamassu-admin/src/styling/theme.js b/new-lamassu-admin/src/styling/theme.js index db730113..77e8e2b4 100644 --- a/new-lamassu-admin/src/styling/theme.js +++ b/new-lamassu-admin/src/styling/theme.js @@ -1,4 +1,4 @@ -import { createTheme } from '@mui/material/styles' +import { createTheme, adaptV4Theme } from '@mui/material/styles'; import typographyStyles from 'src/components/typography/styles' @@ -18,7 +18,7 @@ import { const { p } = typographyStyles -export default createTheme({ +export default createTheme(adaptV4Theme({ typography: { fontFamily: inputFontFamily, body1: { ...p } @@ -158,4 +158,4 @@ export default createTheme({ } } } -}) +})) From 4f9b23b10841a82726565a40ca89c6639540d213 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 15 Apr 2025 12:11:07 +0100 Subject: [PATCH 03/10] partial: second codemod --- new-lamassu-admin/src/components/inputs/base/Dropdown.jsx | 5 +++-- new-lamassu-admin/src/components/inputs/base/TextInput.jsx | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx b/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx index 6e717900..5446f2c7 100644 --- a/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx @@ -7,9 +7,10 @@ import React from 'react' const Dropdown = ({ label, name, options, onChange, value, className }) => { return ( - + {label} - ) + ); } export default Dropdown diff --git a/new-lamassu-admin/src/components/inputs/base/TextInput.jsx b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx index 93ddd83a..d6426aae 100644 --- a/new-lamassu-admin/src/components/inputs/base/TextInput.jsx +++ b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx @@ -35,6 +35,7 @@ const TextInput = memo( return ( - ) + {...props} /> + ); } ) From c6c3feb3b4d8a94854fdad9bfb6386e3b0d515d0 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Mon, 21 Apr 2025 09:12:41 +0100 Subject: [PATCH 04/10] partial: css update --- new-lamassu-admin/package-lock.json | 49 ++++++------------- new-lamassu-admin/src/App.jsx | 13 ++--- new-lamassu-admin/src/components/Carousel.jsx | 2 +- new-lamassu-admin/src/components/Chip.jsx | 2 +- .../src/components/CollapsibleCard.jsx | 2 +- .../src/components/ConfirmDialog.jsx | 2 +- .../src/components/DeleteDialog.jsx | 2 +- .../src/components/ErrorMessage.jsx | 2 +- .../src/components/ImagePopper.jsx | 3 +- .../src/components/InfoMessage.jsx | 3 +- .../src/components/InformativeDialog.jsx | 3 +- .../src/components/LogsDownloaderPopper.jsx | 3 +- new-lamassu-admin/src/components/Modal.jsx | 3 +- .../NotificationCenter/NotificationCenter.jsx | 2 +- .../NotificationCenter/NotificationRow.jsx | 2 +- new-lamassu-admin/src/components/Popper.jsx | 3 +- .../src/components/SearchBox.jsx | 16 +++--- .../src/components/SearchFilter.jsx | 2 +- new-lamassu-admin/src/components/Stage.jsx | 2 +- new-lamassu-admin/src/components/Status.jsx | 2 +- new-lamassu-admin/src/components/Stepper.jsx | 2 +- new-lamassu-admin/src/components/Subtitle.jsx | 2 +- new-lamassu-admin/src/components/Title.jsx | 2 +- new-lamassu-admin/src/components/Tooltip.jsx | 3 +- new-lamassu-admin/src/components/Uptime.jsx | 2 +- .../BooleanPropertiesTable.jsx | 2 +- .../src/components/buttons/ActionButton.jsx | 2 +- .../src/components/buttons/AddButton.jsx | 2 +- .../components/buttons/BaseButton.styles.js | 5 ++ .../src/components/buttons/Button.jsx | 2 +- .../src/components/buttons/DeleteButton.jsx | 2 +- .../src/components/buttons/FeatureButton.jsx | 2 +- .../src/components/buttons/IDButton.jsx | 2 +- .../src/components/buttons/IconButton.jsx | 3 +- .../src/components/buttons/Link.jsx | 2 +- .../src/components/buttons/Link.styles.js | 2 +- .../src/components/buttons/SubpageButton.jsx | 2 +- .../components/buttons/SupportLinkButton.jsx | 2 +- .../components/date-range-picker/Calendar.jsx | 2 +- .../date-range-picker/DateRangePicker.jsx | 2 +- .../src/components/date-range-picker/Tile.jsx | 2 +- .../editableProperty/EditableProperty.jsx | 2 +- .../src/components/editableTable/Header.jsx | 2 +- .../src/components/editableTable/Row.jsx | 2 +- .../src/components/editableTable/Table.jsx | 2 +- .../src/components/fake-table/Table.jsx | 2 +- .../components/inputs/base/Autocomplete.jsx | 28 ++++++----- .../src/components/inputs/base/Checkbox.jsx | 4 +- .../src/components/inputs/base/CodeInput.jsx | 2 +- .../src/components/inputs/base/RadioGroup.jsx | 4 +- .../src/components/inputs/base/Select.jsx | 2 +- .../src/components/inputs/base/Switch.jsx | 10 ++-- .../src/components/inputs/base/TextInput.jsx | 2 +- .../inputs/base/ToggleButtonGroup.jsx | 2 +- .../src/components/inputs/cashbox/Cashbox.jsx | 2 +- .../inputs/formik/CashCassetteInput.jsx | 2 +- .../src/components/layout/Header.jsx | 2 +- .../src/components/layout/Section.jsx | 2 +- .../src/components/layout/Sidebar.jsx | 2 +- .../src/components/layout/TitleSection.jsx | 3 +- .../machineActions/DiagnosticsModal.jsx | 2 +- .../machineActions/MachineActions.jsx | 2 +- .../single-row-table/SingleRowTable.jsx | 2 +- .../src/components/table/EmptyTable.jsx | 2 +- .../src/components/table/Table.jsx | 2 +- .../src/components/table/TableCell.jsx | 2 +- .../src/components/table/TableHeader.jsx | 2 +- .../src/components/table/TableRow.jsx | 2 +- .../src/components/tables/DataTable.jsx | 3 +- .../src/components/typography/index.jsx | 2 +- .../src/pages/AddMachine/AddMachine.jsx | 2 +- .../src/pages/Analytics/Analytics.jsx | 2 +- .../Analytics/components/LegendEntry.jsx | 2 +- .../components/tooltips/GraphTooltip.jsx | 2 +- .../components/wrappers/HourOfDayWrapper.jsx | 2 +- .../components/wrappers/OverTimeWrapper.jsx | 2 +- .../wrappers/TopMachinesWrapper.jsx | 2 +- .../wrappers/VolumeOverTimeWrapper.jsx | 2 +- .../pages/Authentication/Input2FAState.jsx | 2 +- .../pages/Authentication/InputFIDOState.jsx | 2 +- .../src/pages/Authentication/Login.jsx | 3 +- .../src/pages/Authentication/LoginCard.jsx | 2 +- .../src/pages/Authentication/LoginState.jsx | 2 +- .../src/pages/Authentication/Register.jsx | 3 +- .../src/pages/Authentication/Reset2FA.jsx | 3 +- .../pages/Authentication/ResetPassword.jsx | 3 +- .../pages/Authentication/Setup2FAState.jsx | 2 +- .../src/pages/Blacklist/Blacklist.jsx | 2 +- .../src/pages/Blacklist/BlacklistAdvanced.jsx | 2 +- .../src/pages/Blacklist/BlacklistModal.jsx | 2 +- .../src/pages/Blacklist/BlacklistTable.jsx | 2 +- .../src/pages/Cashout/Cashout.jsx | 2 +- .../src/pages/Cashout/WizardSplash.jsx | 2 +- .../src/pages/Cashout/WizardStep.jsx | 2 +- .../src/pages/Commissions/Commissions.jsx | 2 +- .../components/CommissionsList.jsx | 2 +- .../src/pages/Customers/CustomerData.jsx | 2 +- .../src/pages/Customers/CustomerNotes.jsx | 2 +- .../src/pages/Customers/CustomerPhotos.jsx | 3 +- .../src/pages/Customers/CustomerProfile.jsx | 2 +- .../src/pages/Customers/Customers.jsx | 3 +- .../src/pages/Customers/CustomersList.jsx | 2 +- .../src/pages/Customers/Wizard.jsx | 2 +- .../components/CreateCustomerModal.jsx | 2 +- .../components/CustomInfoRequestsData.jsx | 2 +- .../Customers/components/CustomerDetails.jsx | 3 +- .../Customers/components/CustomerSidebar.jsx | 2 +- .../Customers/components/EditableCard.jsx | 2 +- .../src/pages/Customers/components/Field.jsx | 2 +- .../Customers/components/FrontCameraPhoto.jsx | 2 +- .../Customers/components/IdCardPhotoCard.jsx | 3 +- .../pages/Customers/components/PhotosCard.jsx | 2 +- .../Customers/components/PhotosCarousel.jsx | 2 +- .../Customers/components/TransactionsList.jsx | 3 +- .../src/pages/Customers/components/Upload.jsx | 2 +- .../components/notes/NewNoteCard.jsx | 3 +- .../components/notes/NewNoteModal.jsx | 2 +- .../Customers/components/notes/NoteCard.jsx | 3 +- .../Customers/components/notes/NoteEdit.jsx | 3 +- .../components/propertyCard/PropertyCard.jsx | 2 +- .../src/pages/Customers/helper.jsx | 3 +- .../src/pages/Dashboard/Alerts/Alerts.jsx | 2 +- .../pages/Dashboard/Alerts/AlertsTable.jsx | 2 +- .../src/pages/Dashboard/Dashboard.jsx | 2 +- .../src/pages/Dashboard/Footer/Footer.jsx | 2 +- .../src/pages/Dashboard/LeftSide.jsx | 2 +- .../src/pages/Dashboard/RightSide.jsx | 2 +- .../Graphs/PercentageChart.jsx | 2 +- .../pages/Dashboard/SystemPerformance/Nav.jsx | 2 +- .../SystemPerformance/SystemPerformance.jsx | 2 +- .../Dashboard/SystemStatus/MachinesTable.jsx | 2 +- .../Dashboard/SystemStatus/SystemStatus.jsx | 2 +- new-lamassu-admin/src/pages/Funding.jsx | 2 +- .../src/pages/Locales/Locales.jsx | 2 +- .../LoyaltyPanel/IndividualDiscountModal.jsx | 2 +- .../LoyaltyPanel/IndividualDiscounts.jsx | 3 +- .../src/pages/LoyaltyPanel/PromoCodes.jsx | 3 +- .../pages/LoyaltyPanel/PromoCodesModal.jsx | 2 +- new-lamassu-admin/src/pages/MachineLogs.jsx | 2 +- .../MachineComponents/Cassettes/Cassettes.jsx | 2 +- .../Machines/MachineComponents/Details.jsx | 2 +- .../Machines/MachineComponents/Overview.jsx | 2 +- .../Transactions/DataTable.jsx | 3 +- .../Transactions/Transactions.jsx | 2 +- .../src/pages/Machines/MachineSidebar.jsx | 2 +- .../src/pages/Machines/Machines.jsx | 2 +- .../src/pages/Maintenance/CashUnitDetails.jsx | 2 +- .../src/pages/Maintenance/CashUnits.jsx | 3 +- .../src/pages/Maintenance/CashUnitsFooter.jsx | 2 +- .../src/pages/Maintenance/CashboxHistory.jsx | 2 +- .../pages/Maintenance/MachineDetailsCard.jsx | 2 +- .../Maintenance/MachineDetailsCard.styles.js | 2 +- .../src/pages/Maintenance/MachineStatus.jsx | 2 +- .../pages/Maintenance/Wizard/WizardSplash.jsx | 2 +- .../pages/Maintenance/Wizard/WizardStep.jsx | 2 +- .../Notifications/components/EditHeader.jsx | 2 +- .../components/EditableNumber.jsx | 2 +- .../sections/CryptoBalanceAlerts.jsx | 2 +- .../sections/FiatBalanceAlerts.jsx | 2 +- .../pages/Notifications/sections/Setup.jsx | 2 +- .../src/pages/OperatorInfo/CoinATMRadar.jsx | 2 +- .../src/pages/OperatorInfo/ContactInfo.jsx | 2 +- .../src/pages/OperatorInfo/MachineScreens.jsx | 2 +- .../pages/OperatorInfo/ReceiptPrinting.jsx | 2 +- .../OperatorInfo/SMSNotices/SMSNotices.jsx | 3 +- .../SMSNotices/SMSNoticesModal.jsx | 3 +- .../pages/OperatorInfo/TermsConditions.jsx | 2 +- new-lamassu-admin/src/pages/ServerLogs.jsx | 2 +- .../src/pages/Services/FormRenderer.jsx | 3 +- .../src/pages/Services/Services.jsx | 3 +- .../pages/Transactions/CopyToClipboard.jsx | 2 +- .../src/pages/Transactions/DetailsCard.jsx | 3 +- .../src/pages/Transactions/Transactions.jsx | 2 +- .../CustomInfoRequests/CustomInfoRequests.jsx | 2 +- .../CustomInfoRequests/DetailsCard.jsx | 2 +- .../Forms/TypeFields/ChoiceList.jsx | 2 +- .../Forms/TypeFields/NumericalEntry.jsx | 2 +- .../Forms/TypeFields/TextEntry.jsx | 2 +- .../Triggers/CustomInfoRequests/Wizard.jsx | 2 +- .../CustomInfoRequests/WizardSplash.jsx | 2 +- .../src/pages/Triggers/TriggerView.jsx | 3 +- .../src/pages/Triggers/Triggers.jsx | 3 +- .../src/pages/Triggers/Wizard.jsx | 2 +- .../src/pages/Triggers/helper.jsx | 3 +- .../pages/UserManagement/UserManagement.jsx | 3 +- .../UserManagement/modals/ChangeRoleModal.jsx | 2 +- .../UserManagement/modals/CreateUserModal.jsx | 2 +- .../UserManagement/modals/EnableUserModal.jsx | 2 +- .../pages/UserManagement/modals/FIDOModal.jsx | 2 +- .../UserManagement/modals/Input2FAModal.jsx | 2 +- .../UserManagement/modals/Reset2FAModal.jsx | 2 +- .../modals/ResetPasswordModal.jsx | 2 +- new-lamassu-admin/src/pages/Wallet/Wallet.jsx | 2 +- .../src/pages/Wallet/WizardSplash.jsx | 2 +- .../src/pages/Wallet/WizardStep.jsx | 2 +- new-lamassu-admin/src/pages/Wizard/Wizard.jsx | 3 +- .../pages/Wizard/components/Commissions.jsx | 2 +- .../src/pages/Wizard/components/Footer.jsx | 3 +- .../src/pages/Wizard/components/Locales.jsx | 2 +- .../src/pages/Wizard/components/Mailgun.jsx | 2 +- .../pages/Wizard/components/Notifications.jsx | 2 +- .../pages/Wizard/components/OperatorInfo.jsx | 2 +- .../src/pages/Wizard/components/Twilio.jsx | 3 +- .../pages/Wizard/components/Wallet/AllSet.jsx | 2 +- .../Wizard/components/Wallet/Blockcypher.jsx | 2 +- .../Wizard/components/Wallet/ChooseCoin.jsx | 2 +- .../components/Wallet/ChooseExchange.jsx | 2 +- .../Wizard/components/Wallet/ChooseTicker.jsx | 2 +- .../Wizard/components/Wallet/ChooseWallet.jsx | 2 +- .../pages/Wizard/components/Wallet/Wallet.jsx | 2 +- .../src/pages/Wizard/components/Welcome.jsx | 2 +- new-lamassu-admin/src/routing/routes.jsx | 2 +- new-lamassu-admin/src/styling/theme.js | 4 +- 213 files changed, 301 insertions(+), 279 deletions(-) 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}

-
+ renderOption={(props, it) => ( +
  • +
    +

    {it.label || it.value}

    +

    {it.type}

    +
    +
    • )} autoHighlight disableClearable diff --git a/new-lamassu-admin/src/components/SearchFilter.jsx b/new-lamassu-admin/src/components/SearchFilter.jsx index c5ee45fc..3089f637 100644 --- a/new-lamassu-admin/src/components/SearchFilter.jsx +++ b/new-lamassu-admin/src/components/SearchFilter.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material' +import { makeStyles } from '@mui/styles' import React from 'react' import Chip from 'src/components/Chip' import { P, Label3 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/Stage.jsx b/new-lamassu-admin/src/components/Stage.jsx index b4425446..e691e4b4 100644 --- a/new-lamassu-admin/src/components/Stage.jsx +++ b/new-lamassu-admin/src/components/Stage.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/Status.jsx b/new-lamassu-admin/src/components/Status.jsx index c215c4d4..38c02988 100644 --- a/new-lamassu-admin/src/components/Status.jsx +++ b/new-lamassu-admin/src/components/Status.jsx @@ -1,5 +1,5 @@ import Chip from '@mui/material/Chip' -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import React from 'react' import { diff --git a/new-lamassu-admin/src/components/Stepper.jsx b/new-lamassu-admin/src/components/Stepper.jsx index 84f278ef..c8590173 100644 --- a/new-lamassu-admin/src/components/Stepper.jsx +++ b/new-lamassu-admin/src/components/Stepper.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/components/Subtitle.jsx b/new-lamassu-admin/src/components/Subtitle.jsx index b095771f..b22f56a0 100644 --- a/new-lamassu-admin/src/components/Subtitle.jsx +++ b/new-lamassu-admin/src/components/Subtitle.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/Title.jsx b/new-lamassu-admin/src/components/Title.jsx index 90ee8c53..13bf4e5f 100644 --- a/new-lamassu-admin/src/components/Title.jsx +++ b/new-lamassu-admin/src/components/Title.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import React, { memo } from 'react' import { spacer } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/components/Tooltip.jsx b/new-lamassu-admin/src/components/Tooltip.jsx index a11ecb7d..701aa019 100644 --- a/new-lamassu-admin/src/components/Tooltip.jsx +++ b/new-lamassu-admin/src/components/Tooltip.jsx @@ -1,4 +1,5 @@ -import { makeStyles, ClickAwayListener } from '@mui/material' +import { ClickAwayListener } from '@mui/material' +import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState, memo } from 'react' import Popper from 'src/components/Popper' diff --git a/new-lamassu-admin/src/components/Uptime.jsx b/new-lamassu-admin/src/components/Uptime.jsx index 48ed9072..ed1d4a2e 100644 --- a/new-lamassu-admin/src/components/Uptime.jsx +++ b/new-lamassu-admin/src/components/Uptime.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material' +import { makeStyles } from '@mui/styles' import Chip from '@mui/material/Chip' import * as R from 'ramda' import React from 'react' diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx index 2f533454..361adeb2 100644 --- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx +++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { useFormikContext, Form, Formik, Field as FormikField } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.jsx b/new-lamassu-admin/src/components/buttons/ActionButton.jsx index 60de6619..d2fb2043 100644 --- a/new-lamassu-admin/src/components/buttons/ActionButton.jsx +++ b/new-lamassu-admin/src/components/buttons/ActionButton.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/buttons/AddButton.jsx b/new-lamassu-admin/src/components/buttons/AddButton.jsx index 3d96d7c8..4a4c0a43 100644 --- a/new-lamassu-admin/src/components/buttons/AddButton.jsx +++ b/new-lamassu-admin/src/components/buttons/AddButton.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 AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' diff --git a/new-lamassu-admin/src/components/buttons/BaseButton.styles.js b/new-lamassu-admin/src/components/buttons/BaseButton.styles.js index 3d49746e..6bad408a 100644 --- a/new-lamassu-admin/src/components/buttons/BaseButton.styles.js +++ b/new-lamassu-admin/src/components/buttons/BaseButton.styles.js @@ -1,3 +1,5 @@ +// import { outlinedInputClasses } from '@mui/material/ButtonBase'; + import { white, fontColor, @@ -37,6 +39,7 @@ export default { extend: colors(subheaderColor, subheaderDarkColor, offColor), '&:active': { color: white, + // [`& ${outlinedInputClasses.buttonIcon}`]: { '& $buttonIcon': { display: 'none' }, @@ -54,12 +57,14 @@ export default { '&:active': { color: fontColor, '& $buttonIcon': { + // [`& ${outlinedInputClasses.buttonIcon}`]: { display: 'flex' }, '& $buttonIconActive': { display: 'none' } }, + // [`& ${outlinedInputClasses.buttonIcon}`]: { '& $buttonIcon': { display: 'none' }, diff --git a/new-lamassu-admin/src/components/buttons/Button.jsx b/new-lamassu-admin/src/components/buttons/Button.jsx index a9f2767c..84b2d3d4 100644 --- a/new-lamassu-admin/src/components/buttons/Button.jsx +++ b/new-lamassu-admin/src/components/buttons/Button.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/buttons/DeleteButton.jsx b/new-lamassu-admin/src/components/buttons/DeleteButton.jsx index d5df9d7d..3c2f56f6 100644 --- a/new-lamassu-admin/src/components/buttons/DeleteButton.jsx +++ b/new-lamassu-admin/src/components/buttons/DeleteButton.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 DeleteIcon from 'src/styling/icons/button/cancel/zodiac.svg?react' diff --git a/new-lamassu-admin/src/components/buttons/FeatureButton.jsx b/new-lamassu-admin/src/components/buttons/FeatureButton.jsx index ec9bf8c7..ad571077 100644 --- a/new-lamassu-admin/src/components/buttons/FeatureButton.jsx +++ b/new-lamassu-admin/src/components/buttons/FeatureButton.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/buttons/IDButton.jsx b/new-lamassu-admin/src/components/buttons/IDButton.jsx index 2cd14e80..a955d47d 100644 --- a/new-lamassu-admin/src/components/buttons/IDButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IDButton.jsx @@ -1,5 +1,5 @@ import { ClickAwayListener } from '@mui/material' -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { useState, memo } from 'react' import Popover from 'src/components/Popper' diff --git a/new-lamassu-admin/src/components/buttons/IconButton.jsx b/new-lamassu-admin/src/components/buttons/IconButton.jsx index bb58cd97..e3ed0665 100644 --- a/new-lamassu-admin/src/components/buttons/IconButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IconButton.jsx @@ -1,4 +1,5 @@ -import { makeStyles, IconButton as IconB } from '@mui/material' +import { IconButton as IconB } from '@mui/material' +import { makeStyles } from '@mui/styles' import React from 'react' import { comet } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/components/buttons/Link.jsx b/new-lamassu-admin/src/components/buttons/Link.jsx index 9b9ed90a..f121b69f 100644 --- a/new-lamassu-admin/src/components/buttons/Link.jsx +++ b/new-lamassu-admin/src/components/buttons/Link.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/buttons/Link.styles.js b/new-lamassu-admin/src/components/buttons/Link.styles.js index 0d7e54b4..a9f131a0 100644 --- a/new-lamassu-admin/src/components/buttons/Link.styles.js +++ b/new-lamassu-admin/src/components/buttons/Link.styles.js @@ -1,4 +1,4 @@ -import { alpha } from '@mui/material/styles/colorManipulator' +import { alpha } from '@mui/material/styles' import typographyStyles from 'src/components/typography/styles' import { diff --git a/new-lamassu-admin/src/components/buttons/SubpageButton.jsx b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx index 7c7cf456..5f96143a 100644 --- a/new-lamassu-admin/src/components/buttons/SubpageButton.jsx +++ b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { memo, useState } from 'react' import { H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx index 49b8ac94..54d09617 100644 --- a/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx +++ b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material' +import { makeStyles } from '@mui/styles' import React from 'react' import InverseLinkIcon from 'src/styling/icons/action/external link/white.svg?react' import LinkIcon from 'src/styling/icons/action/external link/zodiac.svg?react' diff --git a/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx index 51b613e6..44833125 100644 --- a/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx +++ b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import { add, differenceInMonths, diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx index 054f62ef..1c942913 100644 --- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx +++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { compareAsc, differenceInDays, set } from 'date-fns/fp' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/date-range-picker/Tile.jsx b/new-lamassu-admin/src/components/date-range-picker/Tile.jsx index d9614d0e..679426cb 100644 --- a/new-lamassu-admin/src/components/date-range-picker/Tile.jsx +++ b/new-lamassu-admin/src/components/date-range-picker/Tile.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/components/editableProperty/EditableProperty.jsx b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx index b35c52df..9ff6e383 100644 --- a/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx +++ b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material/styles' +import { makeStyles } from '@mui/styles' import React, { useState, memo } from 'react' import { H4, P } from 'src/components/typography' import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react' diff --git a/new-lamassu-admin/src/components/editableTable/Header.jsx b/new-lamassu-admin/src/components/editableTable/Header.jsx index 0ebbf630..cb06ffaa 100644 --- a/new-lamassu-admin/src/components/editableTable/Header.jsx +++ b/new-lamassu-admin/src/components/editableTable/Header.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@mui/material' +import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' import React, { useContext } from 'react' diff --git a/new-lamassu-admin/src/components/editableTable/Row.jsx b/new-lamassu-admin/src/components/editableTable/Row.jsx index 90afd4bc..72dd5468 100644 --- a/new-lamassu-admin/src/components/editableTable/Row.jsx +++ b/new-lamassu-admin/src/components/editableTable/Row.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/components/editableTable/Table.jsx b/new-lamassu-admin/src/components/editableTable/Table.jsx index 52a7a62e..f7bdefce 100644 --- a/new-lamassu-admin/src/components/editableTable/Table.jsx +++ b/new-lamassu-admin/src/components/editableTable/Table.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, useEffect } from 'react' diff --git a/new-lamassu-admin/src/components/fake-table/Table.jsx b/new-lamassu-admin/src/components/fake-table/Table.jsx index 31aba443..3c5fdef9 100644 --- a/new-lamassu-admin/src/components/fake-table/Table.jsx +++ b/new-lamassu-admin/src/components/fake-table/Table.jsx @@ -1,6 +1,6 @@ import Card from '@mui/material/Card' import CardContent from '@mui/material/CardContent' -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/components/inputs/base/Autocomplete.jsx b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx index ffd90428..f4e46ae3 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx @@ -1,5 +1,5 @@ import { Box } from '@mui/material' -import MAutocomplete from '@mui/lab/Autocomplete' +import MAutocomplete from '@mui/material/Autocomplete' import sort from 'match-sorter' import * as R from 'ramda' import React from 'react' @@ -100,7 +100,7 @@ const Autocomplete = ({ /> ) }} - renderOption={props => { + renderOption={(iprops, props) => { if (!props.warning && !props.warningMessage) return R.path([labelProp])(props) @@ -120,17 +120,19 @@ const Autocomplete = ({ ) return ( - - {R.path([labelProp])(props)} - -

    {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'], From af2105198949e1761f3ba2310fe0c1739b06943a Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Mon, 21 Apr 2025 14:43:17 +0100 Subject: [PATCH 05/10] partial: theme and more css fixes --- new-lamassu-admin/package-lock.json | 131 ------------- new-lamassu-admin/package.json | 1 - new-lamassu-admin/src/components/Popper.jsx | 40 ++-- .../components/buttons/BaseButton.styles.js | 5 - .../src/components/buttons/IconButton.jsx | 10 +- .../src/components/inputs/base/RadioGroup.jsx | 7 +- .../src/components/inputs/base/Switch.jsx | 1 + .../inputs/base/ToggleButtonGroup.jsx | 3 +- .../src/components/layout/Header.jsx | 19 +- .../src/components/typography/styles.js | 2 +- .../src/pages/AddMachine/AddMachine.jsx | 2 +- new-lamassu-admin/src/styling/theme.js | 177 ++++++++++-------- 12 files changed, 153 insertions(+), 245 deletions(-) diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 15e9f98c..d6897569 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -14,7 +14,6 @@ "@emotion/styled": "^11.14.0", "@lamassu/coins": "v1.6.1", "@mui/icons-material": "^5.17.1", - "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.17.1", "@mui/styles": "^5.17.1", "@simplewebauthn/browser": "^3.0.0", @@ -1243,44 +1242,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@floating-ui/core": { - "version": "1.6.9", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz", - "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==", - "license": "MIT", - "dependencies": { - "@floating-ui/utils": "^0.2.9" - } - }, - "node_modules/@floating-ui/dom": { - "version": "1.6.13", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz", - "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==", - "license": "MIT", - "dependencies": { - "@floating-ui/core": "^1.6.0", - "@floating-ui/utils": "^0.2.9" - } - }, - "node_modules/@floating-ui/react-dom": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz", - "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==", - "license": "MIT", - "dependencies": { - "@floating-ui/dom": "^1.0.0" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@floating-ui/utils": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz", - "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==", - "license": "MIT" - }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", @@ -1616,48 +1577,6 @@ "react-dom": "^16.8.0 || ^17.0.0" } }, - "node_modules/@mui/base": { - "version": "5.0.0-beta.40", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz", - "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==", - "deprecated": "This package has been replaced by @base-ui-components/react", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@floating-ui/react-dom": "^2.0.8", - "@mui/types": "^7.2.14", - "@mui/utils": "^5.15.14", - "@popperjs/core": "^2.11.8", - "clsx": "^2.1.0", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@mui/base/node_modules/clsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/@mui/core-downloads-tracker": { "version": "5.17.1", "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.17.1.tgz", @@ -1694,56 +1613,6 @@ } } }, - "node_modules/@mui/lab": { - "version": "5.0.0-alpha.170", - "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.170.tgz", - "integrity": "sha512-0bDVECGmrNjd3+bLdcLiwYZ0O4HP5j5WSQm5DV6iA/Z9kr8O6AnvZ1bv9ImQbbX7Gj3pX4o43EKwCutj3EQxQg==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/base": "5.0.0-beta.40", - "@mui/system": "^5.15.15", - "@mui/types": "^7.2.14", - "@mui/utils": "^5.15.14", - "clsx": "^2.1.0", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@emotion/react": "^11.5.0", - "@emotion/styled": "^11.3.0", - "@mui/material": ">=5.15.0", - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@emotion/react": { - "optional": true - }, - "@emotion/styled": { - "optional": true - }, - "@types/react": { - "optional": true - } - } - }, - "node_modules/@mui/lab/node_modules/clsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/@mui/material": { "version": "5.17.1", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.17.1.tgz", diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json index 32ca64b2..639d0a27 100644 --- a/new-lamassu-admin/package.json +++ b/new-lamassu-admin/package.json @@ -9,7 +9,6 @@ "@emotion/styled": "^11.14.0", "@lamassu/coins": "v1.6.1", "@mui/icons-material": "^5.17.1", - "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.17.1", "@mui/styles": "^5.17.1", "@simplewebauthn/browser": "^3.0.0", diff --git a/new-lamassu-admin/src/components/Popper.jsx b/new-lamassu-admin/src/components/Popper.jsx index 6dc56d01..30203f97 100644 --- a/new-lamassu-admin/src/components/Popper.jsx +++ b/new-lamassu-admin/src/components/Popper.jsx @@ -121,28 +121,42 @@ const Popover = ({ right: ['left'] } - const modifiers = R.mergeDeepLeft(props.modifiers, { - flip: { + const modifiers = [ + { + name: 'flip', enabled: R.defaultTo(false, props.flip), - allowedAutoPlacements: flipPlacements[props.placement], - boundary: 'clippingParents' + options: { + allowedAutoPlacements: flipPlacements[props.placement] + } }, - preventOverflow: { + { + name: 'preventOverflow', enabled: R.defaultTo(true, props.preventOverflow), - boundariesElement: 'scrollParent' + options: { + rootBoundary: 'scrollParent' + } }, - offset: { + { + name: 'offset', enabled: true, - offset: '0, 10' + options: { + offset: [0, 10] + } }, - arrow: { + { + name: 'arrow', enabled: R.defaultTo(true, props.showArrow), - element: arrowRef + options: { + element: arrowRef + } }, - computeStyle: { - gpuAcceleration: false + { + name: 'computeStyles', + options: { + gpuAcceleration: false + } } - }) + ] if (props.preventOverflow === false) { modifiers.hide = { diff --git a/new-lamassu-admin/src/components/buttons/BaseButton.styles.js b/new-lamassu-admin/src/components/buttons/BaseButton.styles.js index 6bad408a..3d49746e 100644 --- a/new-lamassu-admin/src/components/buttons/BaseButton.styles.js +++ b/new-lamassu-admin/src/components/buttons/BaseButton.styles.js @@ -1,5 +1,3 @@ -// import { outlinedInputClasses } from '@mui/material/ButtonBase'; - import { white, fontColor, @@ -39,7 +37,6 @@ export default { extend: colors(subheaderColor, subheaderDarkColor, offColor), '&:active': { color: white, - // [`& ${outlinedInputClasses.buttonIcon}`]: { '& $buttonIcon': { display: 'none' }, @@ -57,14 +54,12 @@ export default { '&:active': { color: fontColor, '& $buttonIcon': { - // [`& ${outlinedInputClasses.buttonIcon}`]: { display: 'flex' }, '& $buttonIconActive': { display: 'none' } }, - // [`& ${outlinedInputClasses.buttonIcon}`]: { '& $buttonIcon': { display: 'none' }, diff --git a/new-lamassu-admin/src/components/buttons/IconButton.jsx b/new-lamassu-admin/src/components/buttons/IconButton.jsx index e3ed0665..52661a22 100644 --- a/new-lamassu-admin/src/components/buttons/IconButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IconButton.jsx @@ -5,11 +5,9 @@ import React from 'react' import { comet } from 'src/styling/variables' const styles = { - label: ({ size }) => ({ + root: ({ size }) => ({ width: size, - height: size - }), - root: { + height: size, '& svg': { flex: 1 }, @@ -25,7 +23,7 @@ const styles = { '&:hover path': { stroke: comet } - } + }) } const useStyles = makeStyles(styles) @@ -36,7 +34,7 @@ const IconButton = ({ size, children, onClick, ...props }) => { {children} diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx index 2f680f87..efd6ce33 100644 --- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx +++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx @@ -8,7 +8,7 @@ import classnames from 'classnames' import React from 'react' import { Label1 } from 'src/components/typography' -import { offColor } from 'src/styling/variables' +import { offColor, secondaryColor } from 'src/styling/variables' const styles = { label: { height: 16, @@ -20,6 +20,9 @@ const styles = { marginTop: -8, marginLeft: 32, color: offColor + }, + radio: { + color: secondaryColor } } @@ -50,7 +53,7 @@ const RadioGroup = ({ } + control={} label={option.display} className={classnames(labelClassName)} /> diff --git a/new-lamassu-admin/src/components/inputs/base/Switch.jsx b/new-lamassu-admin/src/components/inputs/base/Switch.jsx index fedd6b44..79e235f2 100644 --- a/new-lamassu-admin/src/components/inputs/base/Switch.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Switch.jsx @@ -62,6 +62,7 @@ const SwitchInput = memo(({ ...props }) => { const classes = useStyles() return ( { className={classes.popper} disablePortal={false} placement="bottom-end" - modifiers={{ - offset: { + modifiers={[ + { + name: 'offset', enabled: true, - offset: '100vw' + options: { + offset: ['100vw', '100vw'] + } }, - preventOverflow: { + { + name: 'preventOverflow', enabled: true, - boundariesElement: 'viewport', - padding: 0 + options: { + rootBoundary: 'viewport', + }, } - }}> + ]}> {
    Add Machine - + diff --git a/new-lamassu-admin/src/styling/theme.js b/new-lamassu-admin/src/styling/theme.js index 34d1e0ef..869547b7 100644 --- a/new-lamassu-admin/src/styling/theme.js +++ b/new-lamassu-admin/src/styling/theme.js @@ -1,4 +1,4 @@ -import { createTheme, adaptV4Theme } from '@mui/material/styles'; +import { createTheme } from '@mui/material/styles'; import typographyStyles from 'src/components/typography/styles' @@ -18,13 +18,9 @@ import { const { p } = typographyStyles -export default createTheme(adaptV4Theme({ +export default createTheme({ typography: { fontFamily: inputFontFamily, - body1: { ...p } - }, - MuiButtonBase: { - disableRipple: true }, palette: { primary: { @@ -41,105 +37,126 @@ export default createTheme(adaptV4Theme({ default: backgroundColor } }, - overrides: { - MuiRadio: { - colorSecondary: { - color: secondaryColor + components: { + MuiTypography: { + styleOverrides: { + root: { ...p } + } + }, + MuiButtonBase: { + defaultProps: { + disableRipple: true } }, MuiAutocomplete: { - root: { - color: fontColor - }, - noOptions: { - padding: [[6, 16]] - }, - option: { - '&[data-focus="true"]': { - backgroundColor: subheaderColor - } - }, - paper: { - color: fontColor, - margin: 0 - }, - listbox: { - padding: 0 - }, - tag: { - '&[data-tag-index="0"]': { - marginLeft: 0 + styleOverrides: { + root: { + color: fontColor }, - margin: 2, - backgroundColor: subheaderColor, - borderRadius: 4, - height: 18 + noOptions: { + padding: `6px 16px` + }, + option: { + '&[data-focus="true"]': { + backgroundColor: subheaderColor + } + }, + paper: { + color: fontColor, + margin: 0 + }, + listbox: { + padding: 0 + }, + tag: { + '&[data-tag-index="0"]': { + marginLeft: 0 + }, + margin: 2, + backgroundColor: subheaderColor, + borderRadius: 4, + height: 18 + } } }, MuiChip: { - label: { - paddingLeft: 4, - paddingRight: 4, - color: fontColor, - fontSize: fontSize5 + styleOverrides: { + label: { + paddingLeft: 4, + paddingRight: 4, + color: fontColor, + fontSize: fontSize5 + } } }, MuiInput: { - root: { - color: fontColor - }, - underline: { - '&:before': { - borderBottom: [[2, 'solid', fontColor]] + styleOverrides: { + root: { + color: fontColor + }, + underline: { + '&:before': { + borderBottom: `2px solid ${fontColor}` + } } } }, MuiInputLabel: { - root: { - font: 'inherit', - fontSize: fontSize3, - color: offColor - }, - shrink: { - color: fontColor, - transform: 'translate(0, 1.7px) scale(0.83)' + styleOverrides: { + root: { + font: 'inherit', + fontSize: fontSize3, + color: offColor + }, + shrink: { + color: fontColor, + transform: 'translate(0, 1.7px) scale(0.83)' + } } }, MuiFormLabel: { - root: { - '&.Mui-focused': { - color: fontColor + styleOverrides: { + root: { + '&.Mui-focused': { + color: fontColor + } } } }, MuiListItem: { - root: { - '&:nth-of-type(odd)': { - backgroundColor: backgroundColor + styleOverrides: { + root: { + '&:nth-of-type(odd)': { + backgroundColor: backgroundColor + } } } }, MuiToggleButton: { - root: { - '&.Mui-selected': { - backgroundColor: zircon, - borderColor: primaryColor, - borderTopColor: [primaryColor, '!important'], + styleOverrides: { + root: { + '&.Mui-selected': { + backgroundColor: zircon, + borderColor: primaryColor, + borderTopColor: `${primaryColor} !important`, + '&:hover': { + backgroundColor: zircon2 + } + }, '&:hover': { backgroundColor: zircon2 } - }, - '&:hover': { - backgroundColor: zircon2 } } }, MuiToggleButtonGroup: { - groupedVertical: { - borderRadius: 8, - border: '1px solid', - borderColor: zircon, - '&:not(:first-child)': { + styleOverrides: { + vertical: { + borderRadius: 8, + border: 'none', + borderColor: zircon, + }, + firstButton: { borderTop: '1px solid', borderTopColor: zircon, borderTopRightRadius: 8, @@ -147,15 +164,23 @@ export default createTheme(adaptV4Theme({ borderBottomRightRadius: 8, borderBottomLeftRadius: 8 }, - '&:not(:last-child)': { + lastButton: { borderTop: '1px solid', borderTopColor: zircon, borderTopRightRadius: 8, borderTopLeftRadius: 8, borderBottomRightRadius: 8, borderBottomLeftRadius: 8 - } + }, + middleButton: { + borderTop: '1px solid', + borderTopColor: zircon, + borderTopRightRadius: 8, + borderTopLeftRadius: 8, + borderBottomRightRadius: 8, + borderBottomLeftRadius: 8 + }, } } } -})) +}) From 4bfb94182cccb4a6048ae7e4dc6183b4361d115e Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 22 Apr 2025 09:38:01 +0100 Subject: [PATCH 06/10] partial: use theme only for switch customization --- .../src/components/editableTable/Row.jsx | 2 +- .../src/components/inputs/base/Switch.jsx | 81 ------------------- .../src/components/inputs/base/index.js | 2 - .../src/components/inputs/index.js | 2 - .../components/wrappers/OverTimeWrapper.jsx | 5 +- .../wrappers/VolumeOverTimeWrapper.jsx | 5 +- .../src/pages/Blacklist/Blacklist.jsx | 2 +- .../src/pages/Cashout/Cashout.jsx | 2 +- .../src/pages/Customers/CustomerProfile.jsx | 2 +- .../pages/Notifications/sections/Setup.jsx | 2 +- .../src/pages/OperatorInfo/CoinATMRadar.jsx | 2 +- .../src/pages/OperatorInfo/ContactInfo.jsx | 2 +- .../src/pages/OperatorInfo/MachineScreens.jsx | 2 +- .../pages/OperatorInfo/ReceiptPrinting.jsx | 2 +- .../OperatorInfo/SMSNotices/SMSNotices.jsx | 4 +- .../pages/OperatorInfo/TermsConditions.jsx | 2 +- .../src/pages/Triggers/Triggers.jsx | 4 +- .../pages/UserManagement/UserManagement.jsx | 2 +- new-lamassu-admin/src/styling/theme.js | 56 ++++++++++++- 19 files changed, 75 insertions(+), 106 deletions(-) delete mode 100644 new-lamassu-admin/src/components/inputs/base/Switch.jsx diff --git a/new-lamassu-admin/src/components/editableTable/Row.jsx b/new-lamassu-admin/src/components/editableTable/Row.jsx index 72dd5468..7be62e77 100644 --- a/new-lamassu-admin/src/components/editableTable/Row.jsx +++ b/new-lamassu-admin/src/components/editableTable/Row.jsx @@ -1,4 +1,5 @@ import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' @@ -13,7 +14,6 @@ import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import StripesSvg from 'src/styling/icons/stripes.svg?react' import { Link, IconButton } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import TableCtx from './Context' import styles from './Row.styles' diff --git a/new-lamassu-admin/src/components/inputs/base/Switch.jsx b/new-lamassu-admin/src/components/inputs/base/Switch.jsx deleted file mode 100644 index 79e235f2..00000000 --- a/new-lamassu-admin/src/components/inputs/base/Switch.jsx +++ /dev/null @@ -1,81 +0,0 @@ -import Switch from '@mui/material/Switch' -import { makeStyles } from '@mui/styles' -import React, { memo } from 'react' - -import { - secondaryColor, - offColor, - disabledColor, - disabledColor2 -} from '../../../styling/variables' - -const useStyles = makeStyles(theme => ({ - root: { - width: 32, - height: 20, - padding: 0, - margin: theme.spacing(1) - }, - switchBase: { - padding: 2, - '&.Mui-disabled': { - color: disabledColor2, - '& + $track': { - backgroundColor: disabledColor, - opacity: 1 - } - }, - '&.Mui-checked': { - transform: 'translateX(58%)', - color: theme.palette.common.white, - '&.Mui-disabled': { - color: disabledColor2 - }, - '& + $track': { - backgroundColor: secondaryColor, - opacity: 1, - border: 'none' - } - }, - '&.Mui-focusVisible $thumb': { - border: '6px solid #fff', - boxShadow: '0 0 4px 0 rgba(0,0,0,0.24)' - } - }, - thumb: { - width: 16, - height: 16 - }, - track: { - borderRadius: 17, - border: 'none', - backgroundColor: offColor, - opacity: 1, - transition: theme.transitions.create(['background-color', 'border']) - }, - disabled: {}, - checked: {}, - focusVisible: {} -})) - -const SwitchInput = memo(({ ...props }) => { - const classes = useStyles() - return ( - - ) -}) - -export default SwitchInput diff --git a/new-lamassu-admin/src/components/inputs/base/index.js b/new-lamassu-admin/src/components/inputs/base/index.js index 9dc6ecad..d670dcb5 100644 --- a/new-lamassu-admin/src/components/inputs/base/index.js +++ b/new-lamassu-admin/src/components/inputs/base/index.js @@ -5,7 +5,6 @@ import Dropdown from './Dropdown' import NumberInput from './NumberInput' import RadioGroup from './RadioGroup' import SecretInput from './SecretInput' -import Switch from './Switch' import TextInput from './TextInput' import ToggleButtonGroup from './ToggleButtonGroup' export { @@ -13,7 +12,6 @@ export { CodeInput, TextInput, NumberInput, - Switch, SecretInput, RadioGroup, Autocomplete, diff --git a/new-lamassu-admin/src/components/inputs/index.js b/new-lamassu-admin/src/components/inputs/index.js index 00a8b1cb..32847d32 100644 --- a/new-lamassu-admin/src/components/inputs/index.js +++ b/new-lamassu-admin/src/components/inputs/index.js @@ -3,7 +3,6 @@ import Checkbox from './base/Checkbox' import CodeInput from './base/CodeInput' import RadioGroup from './base/RadioGroup' import Select from './base/Select' -import Switch from './base/Switch' import TextInput from './base/TextInput' import { CashIn, CashOut } from './cashbox/Cashbox' @@ -12,7 +11,6 @@ export { TextInput, Checkbox, CodeInput, - Switch, Select, RadioGroup, CashIn, 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 e4a64516..93ba75b7 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx @@ -1,9 +1,10 @@ -import { Box } from '@mui/material' +import Switch from '@mui/material/Switch' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import React, { useState } from 'react' import { H2 } from 'src/components/typography' -import { Select, Switch } from 'src/components/inputs' +import { Select } from 'src/components/inputs' import { primaryColor } from 'src/styling/variables' import styles from '../../Analytics.styles' 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 575f788b..cc3fe801 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx @@ -1,9 +1,10 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' +import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import React, { useState } from 'react' import { H2 } from 'src/components/typography' -import { Select, Switch } from 'src/components/inputs' +import { Select } from 'src/components/inputs' import { neon, java } from 'src/styling/variables' import styles from '../../Analytics.styles' diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx index 5a8344e6..951b9ff4 100644 --- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx +++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx @@ -1,5 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { Box, Dialog, DialogContent, DialogActions } from '@mui/material' +import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' @@ -11,7 +12,6 @@ import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react' import { Link, Button, IconButton, SupportLinkButton } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace } from 'src/utils/config' import styles from './Blacklist.styles' diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.jsx b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx index 62678dce..e301c927 100644 --- a/new-lamassu-admin/src/pages/Cashout/Cashout.jsx +++ b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx @@ -1,5 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import * as R from 'ramda' import React, { useState } from 'react' import { HelpTooltip } from 'src/components/Tooltip' @@ -8,7 +9,6 @@ import { P, Label2 } from 'src/components/typography' import { SupportLinkButton } from 'src/components/buttons' import { NamespacedTable as EditableTable } from 'src/components/editableTable' -import { Switch } from 'src/components/inputs' import { EmptyTable } from 'src/components/table' import { fromNamespace, toNamespace } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx index 67f47227..d748ba0f 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx @@ -6,6 +6,7 @@ import { DialogContent, Dialog } from '@mui/material' +import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import NavigateNextIcon from '@mui/icons-material/NavigateNext' import * as R from 'ramda' @@ -22,7 +23,6 @@ import DataReversedIcon from 'src/styling/icons/button/data/white.svg?react' import DataIcon from 'src/styling/icons/button/data/zodiac.svg?react' import { Button, IconButton, ActionButton } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import { OVERRIDE_AUTHORIZED, OVERRIDE_REJECTED diff --git a/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx index 05b0fdc2..130b7525 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx +++ b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx @@ -1,4 +1,5 @@ import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import * as R from 'ramda' import React, { useContext } from 'react' import { @@ -10,7 +11,6 @@ import { Th } from 'src/components/fake-table/Table' -import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace } from 'src/utils/config' import { sentenceCase } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx index 5ef31d8f..91969087 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx @@ -1,11 +1,11 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import React, { memo } from 'react' import { HelpTooltip } from 'src/components/Tooltip' import { H4, P, Label2 } from 'src/components/typography' import { BooleanPropertiesTable } from 'src/components/booleanPropertiesTable' -import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { SupportLinkButton } from '../../components/buttons' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx index c00b1249..2b26b873 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx @@ -1,5 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import classnames from 'classnames' import { Form, Formik, Field as FormikField } from 'formik' import * as R from 'ramda' @@ -7,7 +8,6 @@ import React, { useState } from 'react' import ErrorMessage from 'src/components/ErrorMessage' import PromptWhenDirty from 'src/components/PromptWhenDirty' import { HelpTooltip } from 'src/components/Tooltip' -import Switch from 'src/components/inputs/base/Switch' import { P, H4, Info3, Label1, Label2, Label3 } from 'src/components/typography' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx index c3561d0e..d66ed288 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx @@ -1,10 +1,10 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import * as R from 'ramda' import React, { memo } from 'react' import { H4, P, Label2 } from 'src/components/typography' -import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { global } from './OperatorInfo.styles' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx index b14ea9f4..3d22330e 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx @@ -1,12 +1,12 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import * as R from 'ramda' import React, { memo } from 'react' import { HelpTooltip } from 'src/components/Tooltip' import { H4, P, Label2 } from 'src/components/typography' import { BooleanPropertiesTable } from 'src/components/booleanPropertiesTable' -import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { SupportLinkButton } from '../../components/buttons' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx index 1c76b064..0b33e062 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx @@ -1,5 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' +import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' @@ -12,7 +13,6 @@ import ExpandIconOpen from 'src/styling/icons/action/expand/open.svg?react' import WhiteLogo from 'src/styling/icons/menu/logo-white.svg?react' import { IconButton, SupportLinkButton } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import { formatDate } from 'src/utils/timezones' import styles from './SMSNotices.styles' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx index 8dab6f7a..f5b03a3d 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx @@ -1,5 +1,6 @@ import { useQuery, useMutation, gql } from "@apollo/client"; import { makeStyles } from '@mui/styles' +import Switch from '@mui/material/Switch' import classnames from 'classnames' import { Form, Formik, Field as FormikField } from 'formik' import * as R from 'ramda' @@ -12,7 +13,6 @@ import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import * as Yup from 'yup' import { Link, IconButton, SupportLinkButton } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import { TextInput } from 'src/components/inputs/formik' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Triggers/Triggers.jsx b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx index 2c1cf485..1043caa1 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 { Box } from '@mui/material' +import Box from '@mui/material/Box' +import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' @@ -15,7 +16,6 @@ import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react' import { Link, SupportLinkButton } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import twilioSchema from 'src/pages/Services/schemas/twilio' import { fromNamespace, toNamespace } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx index ae0260cc..b6583e5c 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 { Box, Chip } from '@mui/material' +import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import { startAttestation } from '@simplewebauthn/browser' import * as R from 'ramda' @@ -15,7 +16,6 @@ import UserRoleIcon from 'src/styling/icons/button/user-role/zodiac.svg?react' import AppContext from 'src/AppContext' import { ActionButton, Link } from 'src/components/buttons' -import { Switch } from 'src/components/inputs' import { IP_CHECK_REGEX } from 'src/utils/constants' import styles from './UserManagement.styles' diff --git a/new-lamassu-admin/src/styling/theme.js b/new-lamassu-admin/src/styling/theme.js index 869547b7..e739bfbe 100644 --- a/new-lamassu-admin/src/styling/theme.js +++ b/new-lamassu-admin/src/styling/theme.js @@ -13,12 +13,12 @@ import { fontSize5, zircon, zircon2, - primaryColor + primaryColor, disabledColor2, disabledColor } from './variables' const { p } = typographyStyles -export default createTheme({ +let theme = createTheme({ typography: { fontFamily: inputFontFamily, }, @@ -37,6 +37,9 @@ export default createTheme({ default: backgroundColor } }, +}) + +theme = createTheme({ components: { MuiTypography: { styleOverrides: { @@ -48,6 +51,53 @@ export default createTheme({ disableRipple: true } }, + MuiSwitch: { + styleOverrides: { + root: { + width: 32, + height: 20, + padding: 0, + margin: theme.spacing(1) + }, + thumb: { + width: 16, + height: 16 + }, + track: { + borderRadius: 17, + border: 'none', + backgroundColor: offColor, + opacity: 1, + transition: theme.transitions.create(['background-color', 'border']) + }, + switchBase: { + padding: 2, + '&.Mui-disabled': { + color: disabledColor2, + '& + .MuiSwitch-track': { + backgroundColor: disabledColor, + opacity: 1 + } + }, + '&.Mui-checked': { + transform: 'translateX(58%)', + color: theme.palette.common.white, + '&.Mui-disabled': { + color: disabledColor2 + }, + '& + .MuiSwitch-track': { + backgroundColor: secondaryColor, + opacity: 1, + border: 'none' + } + }, + '&.Mui-focusVisible .MuiSwitch-thumb': { + border: '6px solid #fff', + boxShadow: '0 0 4px 0 rgba(0,0,0,0.24)' + } + } + } + }, MuiAutocomplete: { styleOverrides: { root: { @@ -184,3 +234,5 @@ export default createTheme({ } } }) + +export default theme \ No newline at end of file From 2937cebc346196b600bab4d994057d4bfa0326c2 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 22 Apr 2025 09:54:37 +0100 Subject: [PATCH 07/10] partial: use preferred import style --- new-lamassu-admin/src/components/ConfirmDialog.jsx | 10 ++++------ new-lamassu-admin/src/components/DeleteDialog.jsx | 8 +++----- new-lamassu-admin/src/components/ImagePopper.jsx | 2 +- new-lamassu-admin/src/components/InfoMessage.jsx | 2 +- .../src/components/InformativeDialog.jsx | 3 ++- .../src/components/LogsDownloaderPopper.jsx | 2 +- new-lamassu-admin/src/components/Modal.jsx | 3 ++- new-lamassu-admin/src/components/Popper.jsx | 3 ++- new-lamassu-admin/src/components/Tooltip.jsx | 2 +- .../src/components/buttons/IDButton.jsx | 2 +- .../src/components/buttons/IconButton.jsx | 2 +- .../src/components/inputs/base/Autocomplete.jsx | 2 +- .../src/components/inputs/base/RadioGroup.jsx | 8 +++----- .../src/components/inputs/base/ToggleButtonGroup.jsx | 3 ++- .../src/components/layout/TitleSection.jsx | 2 +- .../src/components/tables/DataTable.jsx | 2 +- .../src/pages/AddMachine/AddMachine.jsx | 5 ++++- new-lamassu-admin/src/pages/Analytics/Analytics.jsx | 2 +- .../Analytics/components/tooltips/GraphTooltip.jsx | 2 +- .../components/wrappers/HourOfDayWrapper.jsx | 2 +- .../components/wrappers/TopMachinesWrapper.jsx | 2 +- new-lamassu-admin/src/pages/Authentication/Login.jsx | 2 +- .../src/pages/Authentication/Register.jsx | 2 +- .../src/pages/Authentication/Reset2FA.jsx | 2 +- .../src/pages/Authentication/ResetPassword.jsx | 2 +- new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx | 5 ++++- .../src/pages/Blacklist/BlacklistModal.jsx | 2 +- .../src/pages/Customers/CustomerPhotos.jsx | 2 +- .../src/pages/Customers/CustomerProfile.jsx | 12 +++++------- new-lamassu-admin/src/pages/Customers/Customers.jsx | 2 +- .../pages/Customers/components/CustomerDetails.jsx | 2 +- .../src/pages/Customers/components/EditableCard.jsx | 4 +++- .../pages/Customers/components/FrontCameraPhoto.jsx | 2 +- .../pages/Customers/components/IdCardPhotoCard.jsx | 2 +- .../src/pages/Customers/components/IdDataCard.jsx | 2 +- .../pages/Customers/components/TransactionsList.jsx | 2 +- .../pages/Customers/components/notes/NewNoteCard.jsx | 2 +- .../pages/Customers/components/notes/NoteCard.jsx | 2 +- .../pages/Customers/components/notes/NoteEdit.jsx | 2 +- .../components/propertyCard/PropertyCard.jsx | 2 +- new-lamassu-admin/src/pages/Customers/helper.jsx | 2 +- .../src/pages/LoyaltyPanel/IndividualDiscounts.jsx | 2 +- .../src/pages/LoyaltyPanel/PromoCodes.jsx | 2 +- .../MachineComponents/Transactions/DataTable.jsx | 2 +- .../src/pages/Maintenance/CashUnits.jsx | 3 ++- .../src/pages/Maintenance/MachineDetailsCard.jsx | 2 +- .../OperatorInfo/SMSNotices/SMSNoticesModal.jsx | 2 +- .../src/pages/Services/FormRenderer.jsx | 2 +- new-lamassu-admin/src/pages/Services/Services.jsx | 2 +- .../src/pages/Transactions/DetailsCard.jsx | 2 +- new-lamassu-admin/src/pages/Triggers/TriggerView.jsx | 2 +- new-lamassu-admin/src/pages/Triggers/helper.jsx | 2 +- .../src/pages/UserManagement/UserManagement.jsx | 3 ++- new-lamassu-admin/src/pages/Wizard/Wizard.jsx | 3 ++- .../src/pages/Wizard/components/Footer.jsx | 3 ++- .../src/pages/Wizard/components/Twilio.jsx | 2 +- 56 files changed, 83 insertions(+), 75 deletions(-) diff --git a/new-lamassu-admin/src/components/ConfirmDialog.jsx b/new-lamassu-admin/src/components/ConfirmDialog.jsx index b7d9b893..487b2798 100644 --- a/new-lamassu-admin/src/components/ConfirmDialog.jsx +++ b/new-lamassu-admin/src/components/ConfirmDialog.jsx @@ -1,9 +1,7 @@ -import { - Dialog, - DialogActions, - DialogContent, - InputLabel -} from '@mui/material' +import Dialog from '@mui/material/Dialog' +import DialogActions from '@mui/material/DialogActions' +import DialogContent from '@mui/material/DialogContent' +import InputLabel from '@mui/material/InputLabel' import { makeStyles } from '@mui/styles' import React, { memo, useState } from 'react' import { H4, P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/DeleteDialog.jsx b/new-lamassu-admin/src/components/DeleteDialog.jsx index 1e334725..a45b6f78 100644 --- a/new-lamassu-admin/src/components/DeleteDialog.jsx +++ b/new-lamassu-admin/src/components/DeleteDialog.jsx @@ -1,8 +1,6 @@ -import { - Dialog, - DialogActions, - DialogContent, -} from '@mui/material' +import Dialog from '@mui/material/Dialog' +import DialogActions from '@mui/material/DialogActions' +import DialogContent from '@mui/material/DialogContent' import { makeStyles } from '@mui/styles' import React from 'react' import { H4, P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/ImagePopper.jsx b/new-lamassu-admin/src/components/ImagePopper.jsx index 1aa2be09..8053819e 100644 --- a/new-lamassu-admin/src/components/ImagePopper.jsx +++ b/new-lamassu-admin/src/components/ImagePopper.jsx @@ -1,4 +1,4 @@ -import { ClickAwayListener } from '@mui/material' +import ClickAwayListener from '@mui/material/ClickAwayListener' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { memo, useState } from 'react' diff --git a/new-lamassu-admin/src/components/InfoMessage.jsx b/new-lamassu-admin/src/components/InfoMessage.jsx index 1e701d4d..8e59fd90 100644 --- a/new-lamassu-admin/src/components/InfoMessage.jsx +++ b/new-lamassu-admin/src/components/InfoMessage.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import React from 'react' import { Label1 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/InformativeDialog.jsx b/new-lamassu-admin/src/components/InformativeDialog.jsx index 149984bf..a4c0a8f8 100644 --- a/new-lamassu-admin/src/components/InformativeDialog.jsx +++ b/new-lamassu-admin/src/components/InformativeDialog.jsx @@ -1,4 +1,5 @@ -import { Dialog, DialogContent } from '@mui/material' +import Dialog from '@mui/material/Dialog' +import DialogContent from '@mui/material/DialogContent' import { makeStyles } from '@mui/styles' import React, { memo } from 'react' import { H1 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx index c4914fde..ff877809 100644 --- a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx +++ b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx @@ -1,5 +1,5 @@ import { useLazyQuery } from "@apollo/client"; -import { ClickAwayListener } from '@mui/material' +import ClickAwayListener from '@mui/material/ClickAwayListener' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { format, set } from 'date-fns/fp' diff --git a/new-lamassu-admin/src/components/Modal.jsx b/new-lamassu-admin/src/components/Modal.jsx index 062b8425..147a144b 100644 --- a/new-lamassu-admin/src/components/Modal.jsx +++ b/new-lamassu-admin/src/components/Modal.jsx @@ -1,4 +1,5 @@ -import { Modal as MaterialModal, Paper } from '@mui/material' +import MaterialModal from '@mui/material/Modal' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React from 'react' diff --git a/new-lamassu-admin/src/components/Popper.jsx b/new-lamassu-admin/src/components/Popper.jsx index 30203f97..6dc22225 100644 --- a/new-lamassu-admin/src/components/Popper.jsx +++ b/new-lamassu-admin/src/components/Popper.jsx @@ -1,4 +1,5 @@ -import { Popper as MaterialPopper, Paper } from '@mui/material' +import MaterialPopper from '@mui/material/Popper' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/Tooltip.jsx b/new-lamassu-admin/src/components/Tooltip.jsx index 701aa019..863dc417 100644 --- a/new-lamassu-admin/src/components/Tooltip.jsx +++ b/new-lamassu-admin/src/components/Tooltip.jsx @@ -1,4 +1,4 @@ -import { ClickAwayListener } from '@mui/material' +import ClickAwayListener from '@mui/material/ClickAwayListener' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState, memo } from 'react' diff --git a/new-lamassu-admin/src/components/buttons/IDButton.jsx b/new-lamassu-admin/src/components/buttons/IDButton.jsx index a955d47d..122c8975 100644 --- a/new-lamassu-admin/src/components/buttons/IDButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IDButton.jsx @@ -1,4 +1,4 @@ -import { ClickAwayListener } from '@mui/material' +import ClickAwayListener from '@mui/material/ClickAwayListener' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { useState, memo } from 'react' diff --git a/new-lamassu-admin/src/components/buttons/IconButton.jsx b/new-lamassu-admin/src/components/buttons/IconButton.jsx index 52661a22..ee130961 100644 --- a/new-lamassu-admin/src/components/buttons/IconButton.jsx +++ b/new-lamassu-admin/src/components/buttons/IconButton.jsx @@ -1,4 +1,4 @@ -import { IconButton as IconB } from '@mui/material' +import IconB from '@mui/material/IconButton' import { makeStyles } from '@mui/styles' import React from 'react' diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx index f4e46ae3..43395879 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import MAutocomplete from '@mui/material/Autocomplete' import sort from 'match-sorter' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx index efd6ce33..11f1bfdd 100644 --- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx +++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx @@ -1,8 +1,6 @@ -import { - Radio, - RadioGroup as MRadioGroup, - FormControlLabel -} from '@mui/material' +import Radio from '@mui/material/Radio' +import MRadioGroup from '@mui/material/RadioGroup' +import FormControlLabel from '@mui/material/FormControlLabel' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React from 'react' diff --git a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx index 66a051fc..e236e42f 100644 --- a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx +++ b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx @@ -1,5 +1,6 @@ import { makeStyles } from '@mui/styles' -import { ToggleButtonGroup as MUIToggleButtonGroup, ToggleButton } from '@mui/material' +import MUIToggleButtonGroup from '@mui/material/ToggleButtonGroup' +import ToggleButton from '@mui/material/ToggleButton' import React from 'react' import { H4, 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 49755be6..6944a22c 100644 --- a/new-lamassu-admin/src/components/layout/TitleSection.jsx +++ b/new-lamassu-admin/src/components/layout/TitleSection.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/components/tables/DataTable.jsx b/new-lamassu-admin/src/components/tables/DataTable.jsx index c31d0a29..6c55fd54 100644 --- a/new-lamassu-admin/src/components/tables/DataTable.jsx +++ b/new-lamassu-admin/src/components/tables/DataTable.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx index b934041d..03249806 100644 --- a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx +++ b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx @@ -1,5 +1,8 @@ import { useMutation, useQuery, gql } from "@apollo/client"; -import { Dialog, DialogContent, SvgIcon, IconButton } from '@mui/material' +import Dialog from '@mui/material/Dialog' +import DialogContent from '@mui/material/DialogContent' +import SvgIcon from '@mui/material/SvgIcon' +import IconButton from '@mui/material/IconButton' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { Form, Formik, FastField } from 'formik' diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx index 9437df1a..e27f2aa6 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx @@ -1,5 +1,5 @@ import { useQuery, gql } from "@apollo/client"; -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { endOfToday } from 'date-fns' 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 005543d8..e48bdd87 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx +++ b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx @@ -1,4 +1,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { memo } from 'react' 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 f0a58968..d118de6f 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import { getTimezoneOffset } from 'date-fns-tz' import * as R from 'ramda' 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 e6eb81d3..e296c17b 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Authentication/Login.jsx b/new-lamassu-admin/src/pages/Authentication/Login.jsx index 060b4299..ab883a64 100644 --- a/new-lamassu-admin/src/pages/Authentication/Login.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Login.jsx @@ -1,4 +1,4 @@ -import { Grid } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import React from 'react' diff --git a/new-lamassu-admin/src/pages/Authentication/Register.jsx b/new-lamassu-admin/src/pages/Authentication/Register.jsx index ef7a4703..cec03435 100644 --- a/new-lamassu-admin/src/pages/Authentication/Register.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Grid } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import Paper from '@mui/material/Paper' import { Field, Form, Formik } from 'formik' diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx index cff60ae5..e16e1fd8 100644 --- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx +++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Grid } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import Paper from '@mui/material/Paper' import { Form, Formik } from 'formik' diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx index 4eab703c..5c9392b6 100644 --- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx +++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Grid } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import Paper from '@mui/material/Paper' import { Field, Form, Formik } from 'formik' diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx index 951b9ff4..694dd839 100644 --- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx +++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx @@ -1,5 +1,8 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Box, Dialog, DialogContent, DialogActions } from '@mui/material' +import Box from '@mui/material/Box' +import Dialog from '@mui/material/Dialog' +import DialogContent from '@mui/material/DialogContent' +import DialogActions from '@mui/material/DialogActions' import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx index feafa19f..7e5b4dd0 100644 --- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx +++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import { Formik, Form, Field } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx index 4c51ae02..7fb0b767 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx @@ -1,4 +1,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import { format } from 'date-fns/fp' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx index d748ba0f..bd52274d 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx @@ -1,11 +1,9 @@ import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client"; -import { - Breadcrumbs, - Box, - DialogActions, - DialogContent, - Dialog -} from '@mui/material' +import Breadcrumbs from '@mui/material/Breadcrumbs' +import Box from '@mui/material/Box' +import DialogActions from '@mui/material/DialogActions' +import DialogContent from '@mui/material/DialogContent' +import Dialog from '@mui/material/Dialog' import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import NavigateNextIcon from '@mui/icons-material/NavigateNext' diff --git a/new-lamassu-admin/src/pages/Customers/Customers.jsx b/new-lamassu-admin/src/pages/Customers/Customers.jsx index e2aa5af8..7c8657c1 100644 --- a/new-lamassu-admin/src/pages/Customers/Customers.jsx +++ b/new-lamassu-admin/src/pages/Customers/Customers.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx index e3596921..4dd04418 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx index 1952a0c3..682ad41e 100644 --- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx @@ -1,4 +1,6 @@ -import { CardContent, Card, Grid } from '@mui/material' +import CardContent from '@mui/material/CardContent' +import Card from '@mui/material/Card' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { Form, Formik, Field as FormikField } from 'formik' diff --git a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx index 549f4fce..4dcee494 100644 --- a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx @@ -1,4 +1,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' 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 1853e8e3..a2b81cd7 100644 --- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx index f7023eea..8ead9dc0 100644 --- a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { differenceInYears, format, parse } from 'date-fns/fp' import * as R from 'ramda' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx index 771f20c0..ef9fbfc9 100644 --- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx @@ -1,5 +1,5 @@ import { toUnit } from '@lamassu/coins/lightUtils' -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import BigNumber from 'bignumber.js' import classnames from 'classnames' 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 c4c9b7cc..9bef903a 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,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import classNames from 'classnames' import { React } from 'react' 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 07ef4889..c4a4f21a 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,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import { React } from 'react' 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 6b979eb7..3fac6309 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,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import { formatDurationWithOptions, intervalToDuration } from 'date-fns/fp' import { Form, Formik, Field } from 'formik' 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 3d2c4036..4aa22ab9 100644 --- a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx @@ -1,4 +1,4 @@ -import { Paper } from '@mui/material' +import Paper from '@mui/material/Paper' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { memo } from 'react' diff --git a/new-lamassu-admin/src/pages/Customers/helper.jsx b/new-lamassu-admin/src/pages/Customers/helper.jsx index bbfd9b20..3fa95175 100644 --- a/new-lamassu-admin/src/pages/Customers/helper.jsx +++ b/new-lamassu-admin/src/pages/Customers/helper.jsx @@ -1,5 +1,5 @@ import React from 'react' -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { parse, isValid, format } from 'date-fns/fp' diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx index f2f1ff44..a79f187d 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx index 33aec913..ed3ecd1b 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } 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 cde79f18..1957f2af 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,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx index 8508edb0..9377e1e3 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, Box } from '@mui/material' +import DialogActions from '@mui/material/DialogActions' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx index d9b5c8f9..797f312a 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx @@ -1,4 +1,4 @@ -import { Grid /*, Divider */ } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import BigNumber from 'bignumber.js' import React from 'react' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx index 278dedff..745891b7 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx @@ -1,4 +1,4 @@ -import { Chip } from '@mui/material' +import Chip from '@mui/material/Chip' import { makeStyles } from '@mui/styles' import { Form, Formik, Field } from 'formik' import * as R from 'ramda' diff --git a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx index cddc4f6f..599eb8e5 100644 --- a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx +++ b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx @@ -1,4 +1,4 @@ -import { Grid } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { Formik, Form, FastField } from 'formik' diff --git a/new-lamassu-admin/src/pages/Services/Services.jsx b/new-lamassu-admin/src/pages/Services/Services.jsx index aafe0ff9..22b44c92 100644 --- a/new-lamassu-admin/src/pages/Services/Services.jsx +++ b/new-lamassu-admin/src/pages/Services/Services.jsx @@ -1,5 +1,5 @@ import { useQuery, useMutation, gql } from "@apollo/client"; -import { Grid } from '@mui/material' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx index 29464fdf..f4d87525 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx @@ -1,6 +1,6 @@ import { useLazyQuery, useMutation, gql } from "@apollo/client"; import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils' -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import BigNumber from 'bignumber.js' import classNames from 'classnames' diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx index 193fa0da..b98396d6 100644 --- a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx +++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx @@ -1,5 +1,5 @@ import { useMutation, gql } from "@apollo/client"; -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Triggers/helper.jsx b/new-lamassu-admin/src/pages/Triggers/helper.jsx index 1bb0b887..353a7c41 100644 --- a/new-lamassu-admin/src/pages/Triggers/helper.jsx +++ b/new-lamassu-admin/src/pages/Triggers/helper.jsx @@ -1,4 +1,4 @@ -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import { Field, useFormikContext } from 'formik' diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx index b6583e5c..271ccba7 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 { Box, Chip } from '@mui/material' +import Chip from '@mui/material/Chip' +import Box from '@mui/material/Box' import Switch from '@mui/material/Switch' import { makeStyles } from '@mui/styles' import { startAttestation } from '@simplewebauthn/browser' diff --git a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx index 69f6c597..81087696 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 { Dialog, DialogContent } from '@mui/material' +import Dialog from '@mui/material/Dialog' +import DialogContent from '@mui/material/DialogContent' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { useState, useContext } from 'react' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx index 32b6ac64..6a0c005c 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx @@ -1,4 +1,5 @@ -import { Drawer, Grid } from '@mui/material' +import Drawer from '@mui/material/Drawer' +import Grid from '@mui/material/Grid' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { useState } from 'react' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx index 5d977304..78bef57b 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx +++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx @@ -1,5 +1,5 @@ import { useMutation, useQuery, gql } from "@apollo/client"; -import { Box } from '@mui/material' +import Box from '@mui/material/Box' import { makeStyles } from '@mui/styles' import classnames from 'classnames' import React, { useState } from 'react' From 04ef056ba26713a8c332b487dd0a7c9f5e61084c Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 22 Apr 2025 11:56:09 +0100 Subject: [PATCH 08/10] partial: autocomplete and theme --- .../src/components/SearchBox.jsx | 2 +- .../components/inputs/base/Autocomplete.jsx | 5 ++-- new-lamassu-admin/src/styling/theme.js | 27 ++++++++++++++++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/new-lamassu-admin/src/components/SearchBox.jsx b/new-lamassu-admin/src/components/SearchBox.jsx index 7ddbb1ac..0ef4d95e 100644 --- a/new-lamassu-admin/src/components/SearchBox.jsx +++ b/new-lamassu-admin/src/components/SearchBox.jsx @@ -52,7 +52,7 @@ const SearchBox = memo( clearOnEscape multiple filterSelectedOptions - getOptionSelected={(option, value) => option.type === value.type} + isOptionEqualToValue={(option, value) => option.type === value.type} PaperComponent={({ children }) => (
    diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx index 43395879..386f53c7 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx @@ -84,7 +84,7 @@ const Autocomplete = ({ disableClearable ChipProps={{ onDelete: null }} clearOnEscape - getOptionSelected={R.eqProps(valueProp)} + isOptionEqualToValue={R.eqProps(valueProp)} {...props} renderInput={params => { return ( @@ -102,7 +102,7 @@ const Autocomplete = ({ }} renderOption={(iprops, props) => { if (!props.warning && !props.warningMessage) - return R.path([labelProp])(props) + return
  • {R.path([labelProp])(props)}
    • const warningColors = { clean: spring4, @@ -119,6 +119,7 @@ const Autocomplete = ({ /> ) + console.log('props.warningMessage: ', props) return (
  • Date: Tue, 22 Apr 2025 12:46:56 +0100 Subject: [PATCH 09/10] partial: carousel fix --- new-lamassu-admin/package-lock.json | 337 ++++++++-------------------- new-lamassu-admin/package.json | 2 +- 2 files changed, 92 insertions(+), 247 deletions(-) diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index d6897569..50900327 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -38,7 +38,7 @@ "react-copy-to-clipboard": "^5.0.2", "react-dom": "17.0.2", "react-dropzone": "^11.4.2", - "react-material-ui-carousel": "^2.3.11", + "react-material-ui-carousel": "^3.4.2", "react-number-format": "^4.4.1", "react-otp-input": "3.1.1", "react-router-dom": "5.1.2", @@ -526,13 +526,6 @@ "stylis": "4.2.0" } }, - "node_modules/@emotion/hash": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==", - "license": "MIT", - "peer": true - }, "node_modules/@emotion/is-prop-valid": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz", @@ -1406,177 +1399,6 @@ "lodash": "^4.17.10" } }, - "node_modules/@material-ui/core": { - "version": "4.12.4", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz", - "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", - "@material-ui/system": "^4.12.2", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.4", - "hoist-non-react-statics": "^3.3.2", - "popper.js": "1.16.1-lts", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0", - "react-transition-group": "^4.4.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@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/icons": { - "version": "4.11.2", - "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.2.tgz", - "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" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "@material-ui/core": "^4.0.0", - "@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", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "clsx": "^1.0.4", - "csstype": "^2.5.2", - "hoist-non-react-statics": "^3.3.2", - "jss": "^10.5.1", - "jss-plugin-camel-case": "^10.5.1", - "jss-plugin-default-unit": "^10.5.1", - "jss-plugin-global": "^10.5.1", - "jss-plugin-nested": "^10.5.1", - "jss-plugin-props-sort": "^10.5.1", - "jss-plugin-rule-value-function": "^10.5.1", - "jss-plugin-vendor-prefixer": "^10.5.1", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@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/system": { - "version": "4.12.2", - "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", - "csstype": "^2.5.2", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@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/types": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", - "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==", - "license": "MIT", - "peer": true, - "peerDependencies": { - "@types/react": "*" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@material-ui/utils": { - "version": "4.11.3", - "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", - "react-is": "^16.8.0 || ^17.0.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - } - }, "node_modules/@mui/core-downloads-tracker": { "version": "5.17.1", "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.17.1.tgz", @@ -2762,7 +2584,8 @@ "version": "0.16.8", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@vitejs/plugin-react-swc": { "version": "3.8.1", @@ -3091,35 +2914,6 @@ "node": ">=4" } }, - "node_modules/auto-bind": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-2.1.1.tgz", - "integrity": "sha512-NUwV1i9D3vxxY1KnfZgSZ716d6ovY7o8LfOwLhGIPFBowIb6Ln6DBW64+jCqPzUznel2hRSkQnYQqvh7/ldw8A==", - "license": "MIT", - "dependencies": { - "@types/react": "^16.8.12" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/auto-bind/node_modules/@types/react": { - "version": "16.14.63", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.63.tgz", - "integrity": "sha512-s83gano0fRBVEw3ejdLpjgvU83F0LIeeuXqdxfPZF/Sc2bhr60tEqCK1zZ+aLirBwRSD6V5zCtOsEjcwKow3JQ==", - "license": "MIT", - "dependencies": { - "@types/prop-types": "*", - "@types/scheduler": "^0.16", - "csstype": "^3.0.2" - } - }, - "node_modules/auto-bind/node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "license": "MIT" - }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -3875,13 +3669,6 @@ "is-in-browser": "^1.0.2" } }, - "node_modules/csstype": { - "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", - "peer": true - }, "node_modules/d3": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/d3/-/d3-6.7.0.tgz", @@ -5226,6 +5013,52 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "license": "0BSD" }, + "node_modules/framer-motion": { + "version": "4.1.17", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-4.1.17.tgz", + "integrity": "sha512-thx1wvKzblzbs0XaK2X0G1JuwIdARcoNOW7VVwjO8BUltzXPyONGAElLu6CiCScsOQRI7FIk/45YTFtJw5Yozw==", + "license": "MIT", + "dependencies": { + "framesync": "5.3.0", + "hey-listen": "^1.0.8", + "popmotion": "9.3.6", + "style-value-types": "4.1.4", + "tslib": "^2.1.0" + }, + "optionalDependencies": { + "@emotion/is-prop-valid": "^0.8.2" + }, + "peerDependencies": { + "react": ">=16.8 || ^17.0.0", + "react-dom": ">=16.8 || ^17.0.0" + } + }, + "node_modules/framer-motion/node_modules/@emotion/is-prop-valid": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", + "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==", + "license": "MIT", + "optional": true, + "dependencies": { + "@emotion/memoize": "0.7.4" + } + }, + "node_modules/framer-motion/node_modules/@emotion/memoize": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", + "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==", + "license": "MIT", + "optional": true + }, + "node_modules/framesync": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/framesync/-/framesync-5.3.0.tgz", + "integrity": "sha512-oc5m68HDO/tuK2blj7ZcdEBRx3p1PjrgHazL8GYEpvULhrtGIFbQArN6cQS2QhW8mitffaB+VYzMjDqBxxQeoA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -5615,6 +5448,12 @@ "hermes-estree": "0.25.1" } }, + "node_modules/hey-listen": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/hey-listen/-/hey-listen-1.0.8.tgz", + "integrity": "sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==", + "license": "MIT" + }, "node_modules/history": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", @@ -7325,12 +7164,17 @@ "node": ">=0.10.0" } }, - "node_modules/popper.js": { - "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==", + "node_modules/popmotion": { + "version": "9.3.6", + "resolved": "https://registry.npmjs.org/popmotion/-/popmotion-9.3.6.tgz", + "integrity": "sha512-ZTbXiu6zIggXzIliMi8LGxXBF5ST+wkpXGEjeTUDUOCdSQ356hij/xjeUdv0F8zCQNeqB1+PR5/BB+gC+QLAPw==", "license": "MIT", - "peer": true + "dependencies": { + "framesync": "5.3.0", + "hey-listen": "^1.0.8", + "style-value-types": "4.1.4", + "tslib": "^2.1.0" + } }, "node_modules/possible-typed-array-names": { "version": "1.1.0", @@ -7556,13 +7400,6 @@ "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==", "license": "MIT" }, - "node_modules/react-is": { - "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", - "peer": true - }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", @@ -7570,19 +7407,26 @@ "license": "MIT" }, "node_modules/react-material-ui-carousel": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/react-material-ui-carousel/-/react-material-ui-carousel-2.3.11.tgz", - "integrity": "sha512-rsD9D2JLDBTfinaPy1+hcb7gunfdX7jmga7xESfRCCtLXzokOrkhmx4qMd8dZmYY42zc/HbYqLqg9E/d187lbw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/react-material-ui-carousel/-/react-material-ui-carousel-3.4.2.tgz", + "integrity": "sha512-jUbC5aBWqbbbUOOdUe3zTVf4kMiZFwKJqwhxzHgBfklaXQbSopis4iWAHvEOLcZtSIJk4JAGxKE0CmxDoxvUuw==", "license": "MIT", "dependencies": { - "auto-bind": "^2.1.1", - "react-swipeable": "^6.1.0" + "@emotion/react": "^11.7.1", + "@emotion/styled": "^11.6.0", + "@mui/icons-material": "^5.4.1", + "@mui/material": "^5.4.1", + "@mui/system": "^5.4.1", + "framer-motion": "^4.1.17" }, "peerDependencies": { - "@material-ui/core": "^4.11.3", - "@material-ui/icons": "^4.11.2", - "react": "^16.13.1 || ^17.0.1", - "react-dom": "^16.13.1 || ^17.0.1" + "@emotion/react": "^11.4.1", + "@emotion/styled": "^11.3.0", + "@mui/icons-material": "^5.0.0", + "@mui/material": "^5.0.0", + "@mui/system": "^5.0.0", + "react": "^17.0.1 || ^18.0.0", + "react-dom": "^17.0.2 || ^18.0.0" } }, "node_modules/react-number-format": { @@ -7653,15 +7497,6 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "license": "MIT" }, - "node_modules/react-swipeable": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-6.2.2.tgz", - "integrity": "sha512-Oz7nSFrssvq2yvy05aNL3F+yBUqSvLsK6x1mu+rQFOpMdQVnt4izKt1vyjvvTb70q6GQOaSpaB6qniROW2MAzQ==", - "license": "MIT", - "peerDependencies": { - "react": "^16.8.3 || ^17 || ^18" - } - }, "node_modules/react-transition-group": { "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", @@ -8470,6 +8305,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/style-value-types": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/style-value-types/-/style-value-types-4.1.4.tgz", + "integrity": "sha512-LCJL6tB+vPSUoxgUBt9juXIlNJHtBMy8jkXzUJSBzeHWdBu6lhzHqCvLVkXFGsFIlNa2ln1sQHya/gzaFmB2Lg==", + "license": "MIT", + "dependencies": { + "hey-listen": "^1.0.8", + "tslib": "^2.1.0" + } + }, "node_modules/stylis": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json index 639d0a27..1526575e 100644 --- a/new-lamassu-admin/package.json +++ b/new-lamassu-admin/package.json @@ -33,7 +33,7 @@ "react-copy-to-clipboard": "^5.0.2", "react-dom": "17.0.2", "react-dropzone": "^11.4.2", - "react-material-ui-carousel": "^2.3.11", + "react-material-ui-carousel": "^3.4.2", "react-number-format": "^4.4.1", "react-otp-input": "3.1.1", "react-router-dom": "5.1.2", From fff589bbb4f1d0d6779a8ec9397a2a539153dc0b Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Mon, 28 Apr 2025 07:20:15 +0100 Subject: [PATCH 10/10] fix: proper popper usage --- new-lamassu-admin/src/components/Popper.jsx | 8 +------- .../src/components/inputs/base/Autocomplete.jsx | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/new-lamassu-admin/src/components/Popper.jsx b/new-lamassu-admin/src/components/Popper.jsx index 6dc22225..75159a0a 100644 --- a/new-lamassu-admin/src/components/Popper.jsx +++ b/new-lamassu-admin/src/components/Popper.jsx @@ -132,7 +132,7 @@ const Popover = ({ }, { name: 'preventOverflow', - enabled: R.defaultTo(true, props.preventOverflow), + enabled: true, options: { rootBoundary: 'scrollParent' } @@ -159,12 +159,6 @@ const Popover = ({ } ] - if (props.preventOverflow === false) { - modifiers.hide = { - enabled: false - } - } - return ( <> ) - console.log('props.warningMessage: ', props) return (
  • - ); + ) } export default Autocomplete