diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 19b708c66..7e71f6213 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,5 @@ [toolchain] -channel = "1.80" # also update this in the readme, changelog, and github actions +# also update this in the readme, changelog, and github actions +channel = "1.79" components = ["clippy"] targets = ["armv7-unknown-linux-gnueabihf"] diff --git a/src-gui/index.html b/src-gui/index.html index 4f8025605..ac2ac0d37 100644 --- a/src-gui/index.html +++ b/src-gui/index.html @@ -2,9 +2,8 @@ - - Tauri + React + Typescript + UnstoppableSwap diff --git a/src-gui/package.json b/src-gui/package.json index 4926bc02d..059e64391 100644 --- a/src-gui/package.json +++ b/src-gui/package.json @@ -10,9 +10,12 @@ "tauri": "tauri" }, "dependencies": { - "@material-ui/core": "^4.12.4", - "@material-ui/icons": "^4.11.3", - "@material-ui/lab": "^4.0.0-alpha.61", + "@emotion/react": "^11.13.3", + "@emotion/styled": "^11.13.0", + "@mui/icons-material": "^5.16.7", + "@mui/lab": "^5.0.0-alpha.173", + "@mui/material": "^5.16.7", + "@mui/styles": "^5.16.7", "@reduxjs/toolkit": "^2.2.6", "@tauri-apps/api": "2.0.0-rc.1", "humanize-duration": "^3.32.1", @@ -21,7 +24,7 @@ "notistack": "^3.0.1", "pino": "^9.2.0", "pino-pretty": "^11.2.1", - "react": "^18.2.0", + "react": "^18.3.1", "react-dom": "^18.2.0", "react-qr-code": "^2.0.15", "react-redux": "^9.1.2", @@ -35,7 +38,7 @@ "@types/humanize-duration": "^3.27.4", "@types/lodash": "^4.17.6", "@types/node": "^20.14.10", - "@types/react": "^18.2.15", + "@types/react": "^18.3.1", "@types/react-dom": "^18.2.7", "@types/semver": "^7.5.8", "@vitejs/plugin-react": "^4.2.1", diff --git a/src-gui/public/.gitignore b/src-gui/public/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/src-gui/public/tauri.svg b/src-gui/public/tauri.svg deleted file mode 100644 index 31b62c928..000000000 --- a/src-gui/public/tauri.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src-gui/public/vite.svg b/src-gui/public/vite.svg deleted file mode 100644 index e7b8dfb1b..000000000 --- a/src-gui/public/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src-gui/src/models/tauriModel.ts b/src-gui/src/models/tauriModel.ts index b7b317aed..ecbf52f1a 100644 --- a/src-gui/src/models/tauriModel.ts +++ b/src-gui/src/models/tauriModel.ts @@ -21,165 +21,194 @@ export type PunishTimelock = number; export type Amount = number; export interface BuyXmrArgs { - seller: string; - bitcoin_change_address: string; - monero_receive_address: string; + seller: string; + bitcoin_change_address: string; + monero_receive_address: string; } export interface ResumeArgs { - swap_id: string; + swap_id: string; } export interface CancelAndRefundArgs { - swap_id: string; + swap_id: string; } export interface MoneroRecoveryArgs { - swap_id: string; + swap_id: string; } export interface WithdrawBtcArgs { - amount?: number; - address: string; + amount?: number; + address: string; } export interface BalanceArgs { - force_refresh: boolean; + force_refresh: boolean; } export interface ListSellersArgs { - rendezvous_point: string; + rendezvous_point: string; } export interface StartDaemonArgs { - server_address: string; + server_address: string; } export interface GetSwapInfoArgs { - swap_id: string; + swap_id: string; } export interface ResumeSwapResponse { - result: string; + result: string; } export interface BalanceResponse { - balance: number; + balance: number; } /** Represents a quote for buying XMR. */ export interface BidQuote { - /** The price at which the maker is willing to buy at. */ - price: number; - /** - * The minimum quantity the maker is willing to buy. - * #[typeshare(serialized_as = "number")] - */ - min_quantity: number; - /** The maximum quantity the maker is willing to buy. */ - max_quantity: number; + /** The price at which the maker is willing to buy at. */ + price: number; + /** + * The minimum quantity the maker is willing to buy. + * #[typeshare(serialized_as = "number")] + */ + min_quantity: number; + /** The maximum quantity the maker is willing to buy. */ + max_quantity: number; } export interface BuyXmrResponse { - swap_id: string; - quote: BidQuote; + swap_id: string; + quote: BidQuote; } export interface GetHistoryEntry { - swap_id: string; - state: string; + swap_id: string; + state: string; } export interface GetHistoryResponse { - swaps: GetHistoryEntry[]; + swaps: GetHistoryEntry[]; } export interface Seller { - peer_id: string; - addresses: string[]; -} - -export type ExpiredTimelocks = - | { type: "None", content: { - blocks_left: number; -}} - | { type: "Cancel", content: { - blocks_left: number; -}} - | { type: "Punish", content?: undefined }; + peer_id: string; + addresses: string[]; +} + +export type ExpiredTimelocks = + | { + type: "None"; + content: { + blocks_left: number; + }; + } + | { + type: "Cancel"; + content: { + blocks_left: number; + }; + } + | { type: "Punish"; content?: undefined }; export interface GetSwapInfoResponse { - swap_id: string; - seller: Seller; - completed: boolean; - start_date: string; - state_name: string; - xmr_amount: number; - btc_amount: number; - tx_lock_id: string; - tx_cancel_fee: number; - tx_refund_fee: number; - tx_lock_fee: number; - btc_refund_address: string; - cancel_timelock: CancelTimelock; - punish_timelock: PunishTimelock; - timelock?: ExpiredTimelocks; + swap_id: string; + seller: Seller; + completed: boolean; + start_date: string; + state_name: string; + xmr_amount: number; + btc_amount: number; + tx_lock_id: string; + tx_cancel_fee: number; + tx_refund_fee: number; + tx_lock_fee: number; + btc_refund_address: string; + cancel_timelock: CancelTimelock; + punish_timelock: PunishTimelock; + timelock?: ExpiredTimelocks; } export interface WithdrawBtcResponse { - amount: number; - txid: string; + amount: number; + txid: string; } export interface SuspendCurrentSwapResponse { - swap_id: string; -} - -export type TauriSwapProgressEvent = - | { type: "Initiated", content?: undefined } - | { type: "ReceivedQuote", content: BidQuote } - | { type: "WaitingForBtcDeposit", content: { - deposit_address: string; - max_giveable: number; - min_deposit_until_swap_will_start: number; - max_deposit_until_maximum_amount_is_reached: number; - min_bitcoin_lock_tx_fee: number; - quote: BidQuote; -}} - | { type: "Started", content: { - btc_lock_amount: number; - btc_tx_lock_fee: number; -}} - | { type: "BtcLockTxInMempool", content: { - btc_lock_txid: string; - btc_lock_confirmations: number; -}} - | { type: "XmrLockTxInMempool", content: { - xmr_lock_txid: string; - xmr_lock_tx_confirmations: number; -}} - | { type: "XmrLocked", content?: undefined } - | { type: "BtcRedeemed", content?: undefined } - | { type: "XmrRedeemInMempool", content: { - xmr_redeem_txid: string; - xmr_redeem_address: string; -}} - | { type: "BtcCancelled", content: { - btc_cancel_txid: string; -}} - | { type: "BtcRefunded", content: { - btc_refund_txid: string; -}} - | { type: "BtcPunished", content?: undefined } - | { type: "AttemptingCooperativeRedeem", content?: undefined } - | { type: "CooperativeRedeemAccepted", content?: undefined } - | { type: "CooperativeRedeemRejected", content: { - reason: string; -}} - | { type: "Released", content?: undefined }; + swap_id: string; +} + +export type TauriSwapProgressEvent = + | { type: "Initiated"; content?: undefined } + | { type: "ReceivedQuote"; content: BidQuote } + | { + type: "WaitingForBtcDeposit"; + content: { + deposit_address: string; + max_giveable: number; + min_deposit_until_swap_will_start: number; + max_deposit_until_maximum_amount_is_reached: number; + min_bitcoin_lock_tx_fee: number; + quote: BidQuote; + }; + } + | { + type: "Started"; + content: { + btc_lock_amount: number; + btc_tx_lock_fee: number; + }; + } + | { + type: "BtcLockTxInMempool"; + content: { + btc_lock_txid: string; + btc_lock_confirmations: number; + }; + } + | { + type: "XmrLockTxInMempool"; + content: { + xmr_lock_txid: string; + xmr_lock_tx_confirmations: number; + }; + } + | { type: "XmrLocked"; content?: undefined } + | { type: "BtcRedeemed"; content?: undefined } + | { + type: "XmrRedeemInMempool"; + content: { + xmr_redeem_txid: string; + xmr_redeem_address: string; + }; + } + | { + type: "BtcCancelled"; + content: { + btc_cancel_txid: string; + }; + } + | { + type: "BtcRefunded"; + content: { + btc_refund_txid: string; + }; + } + | { type: "BtcPunished"; content?: undefined } + | { type: "AttemptingCooperativeRedeem"; content?: undefined } + | { type: "CooperativeRedeemAccepted"; content?: undefined } + | { + type: "CooperativeRedeemRejected"; + content: { + reason: string; + }; + } + | { type: "Released"; content?: undefined }; export interface TauriSwapProgressEventWrapper { - swap_id: string; - event: TauriSwapProgressEvent; + swap_id: string; + event: TauriSwapProgressEvent; } - diff --git a/src-gui/src/renderer/components/App.tsx b/src-gui/src/renderer/components/App.tsx index 0123e2026..2fe0145c6 100644 --- a/src-gui/src/renderer/components/App.tsx +++ b/src-gui/src/renderer/components/App.tsx @@ -1,6 +1,11 @@ -import { Box, CssBaseline, makeStyles } from "@material-ui/core"; -import { indigo } from "@material-ui/core/colors"; -import { createTheme, ThemeProvider } from "@material-ui/core/styles"; +import { adaptV4Theme, Box, CssBaseline } from "@mui/material"; +import { indigo } from "@mui/material/colors"; +import { + createTheme, + StyledEngineProvider, + ThemeProvider, +} from "@mui/material/styles"; +import makeStyles from "@mui/styles/makeStyles"; import { Route, MemoryRouter as Router, Routes } from "react-router-dom"; import Navigation, { drawerWidth } from "./navigation/Navigation"; import HelpPage from "./pages/help/HelpPage"; @@ -18,23 +23,29 @@ const useStyles = makeStyles((theme) => ({ }, })); -const theme = createTheme({ - palette: { - type: "dark", - primary: { - main: "#f4511e", +const theme = createTheme( + adaptV4Theme({ + palette: { + mode: "dark", + primary: { + main: "#f4511e", + }, + secondary: indigo, + background: { + default: "#303030", + paper: "#424242", + }, }, - secondary: indigo, - }, - transitions: { - create: () => "none", - }, - props: { - MuiButtonBase: { - disableRipple: true, + transitions: { + create: () => "none", }, - }, -}); + props: { + MuiButtonBase: { + disableRipple: true, + }, + }, + }), +); function InnerContent() { const classes = useStyles(); @@ -54,14 +65,16 @@ function InnerContent() { export default function App() { return ( - - - - - - - - - + + + + + + + + + + + ); } diff --git a/src-gui/src/renderer/components/PromiseInvokeButton.tsx b/src-gui/src/renderer/components/PromiseInvokeButton.tsx index c4044da1c..4b46aaa14 100644 --- a/src-gui/src/renderer/components/PromiseInvokeButton.tsx +++ b/src-gui/src/renderer/components/PromiseInvokeButton.tsx @@ -1,5 +1,5 @@ -import { Button, ButtonProps, IconButton } from "@material-ui/core"; -import CircularProgress from "@material-ui/core/CircularProgress"; +import { Button, ButtonProps, IconButton } from "@mui/material"; +import CircularProgress from "@mui/material/CircularProgress"; import { useSnackbar } from "notistack"; import { ReactNode, useState } from "react"; @@ -60,7 +60,12 @@ export default function PromiseInvokeButton({ const isDisabled = disabled || isLoading; return isIconButton ? ( - + {actualEndIcon} ) : ( diff --git a/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx b/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx index ce6838755..4f42d577a 100644 --- a/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx +++ b/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx @@ -1,5 +1,5 @@ -import { Button } from "@material-ui/core"; -import Alert from "@material-ui/lab/Alert"; +import { Button } from "@mui/material"; +import Alert from "@mui/material/Alert"; import { useNavigate } from "react-router-dom"; import { useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx b/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx index e6129c10c..388f69fee 100644 --- a/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx +++ b/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx @@ -1,5 +1,5 @@ -import { Box, LinearProgress } from "@material-ui/core"; -import { Alert } from "@material-ui/lab"; +import { Box, LinearProgress } from "@mui/material"; +import { Alert } from "@mui/material"; import { useAppSelector } from "store/hooks"; export default function MoneroWalletRpcUpdatingAlert() { diff --git a/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx b/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx index fee72d430..1e1cb2b48 100644 --- a/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx +++ b/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx @@ -1,5 +1,6 @@ -import { Box, makeStyles } from "@material-ui/core"; -import { Alert } from "@material-ui/lab"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import { Alert } from "@mui/material"; import { useAppSelector } from "store/hooks"; import { SatsAmount } from "../other/Units"; import WalletRefreshButton from "../pages/wallet/WalletRefreshButton"; diff --git a/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx b/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx index 437e0262f..9ee8d4518 100644 --- a/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx +++ b/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx @@ -1,5 +1,5 @@ -import { CircularProgress } from "@material-ui/core"; -import { Alert } from "@material-ui/lab"; +import { CircularProgress } from "@mui/material"; +import { Alert } from "@mui/material"; import { RpcProcessStateType } from "models/rpcModel"; import { useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx b/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx index 648dee3de..5a52a4bee 100644 --- a/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx +++ b/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx @@ -1,5 +1,5 @@ -import { makeStyles } from "@material-ui/core"; -import { Alert, AlertTitle } from "@material-ui/lab"; +import makeStyles from "@mui/styles/makeStyles"; +import { Alert, AlertTitle } from "@mui/material"; import { isSwapTimelockInfoCancelled, isSwapTimelockInfoNone, diff --git a/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx b/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx index e6a5774ac..8b97f43f3 100644 --- a/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx +++ b/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx @@ -1,5 +1,6 @@ -import { Box, makeStyles } from "@material-ui/core"; -import { Alert, AlertTitle } from "@material-ui/lab/"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import { Alert, AlertTitle } from "@mui/lab/"; import { GetSwapInfoResponse } from "models/tauriModel"; import { BobStateName, diff --git a/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx b/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx index a0bacfea2..fa94e8126 100644 --- a/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx +++ b/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx @@ -1,4 +1,5 @@ -import { Box, makeStyles } from "@material-ui/core"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { useSwapInfosSortedByDate } from "store/hooks"; import SwapStatusAlert from "./SwapStatusAlert"; diff --git a/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx b/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx index 870836450..baf1f35a6 100644 --- a/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx +++ b/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx @@ -1,5 +1,5 @@ -import { Button } from "@material-ui/core"; -import Alert from "@material-ui/lab/Alert"; +import { Button } from "@mui/material"; +import Alert from "@mui/material/Alert"; import { useNavigate } from "react-router-dom"; import { useResumeableSwapsCount } from "store/hooks"; diff --git a/src-gui/src/renderer/components/icons/BitcoinIcon.tsx b/src-gui/src/renderer/components/icons/BitcoinIcon.tsx index 9c2eb4a59..3416536f4 100644 --- a/src-gui/src/renderer/components/icons/BitcoinIcon.tsx +++ b/src-gui/src/renderer/components/icons/BitcoinIcon.tsx @@ -1,5 +1,5 @@ -import { SvgIcon } from "@material-ui/core"; -import { SvgIconProps } from "@material-ui/core/SvgIcon/SvgIcon"; +import { SvgIcon } from "@mui/material"; +import { SvgIconProps } from "@mui/material/SvgIcon/SvgIcon"; export default function BitcoinIcon(props: SvgIconProps) { return ( diff --git a/src-gui/src/renderer/components/icons/DiscordIcon.tsx b/src-gui/src/renderer/components/icons/DiscordIcon.tsx index e20fdbebf..b4dfb23fc 100644 --- a/src-gui/src/renderer/components/icons/DiscordIcon.tsx +++ b/src-gui/src/renderer/components/icons/DiscordIcon.tsx @@ -1,5 +1,5 @@ -import { SvgIcon } from "@material-ui/core"; -import { SvgIconProps } from "@material-ui/core/SvgIcon/SvgIcon"; +import { SvgIcon } from "@mui/material"; +import { SvgIconProps } from "@mui/material/SvgIcon/SvgIcon"; export default function DiscordIcon(props: SvgIconProps) { return ( diff --git a/src-gui/src/renderer/components/icons/LinkIconButton.tsx b/src-gui/src/renderer/components/icons/LinkIconButton.tsx index a5d969ee0..59213dd53 100644 --- a/src-gui/src/renderer/components/icons/LinkIconButton.tsx +++ b/src-gui/src/renderer/components/icons/LinkIconButton.tsx @@ -1,4 +1,4 @@ -import { IconButton } from "@material-ui/core"; +import { IconButton } from "@mui/material"; import { ReactNode } from "react"; export default function LinkIconButton({ @@ -9,7 +9,11 @@ export default function LinkIconButton({ children: ReactNode; }) { return ( - window.open(url, "_blank")}> + window.open(url, "_blank")} + size="large" + > {children} ); diff --git a/src-gui/src/renderer/components/icons/MoneroIcon.tsx b/src-gui/src/renderer/components/icons/MoneroIcon.tsx index d115944ed..d7939bd0f 100644 --- a/src-gui/src/renderer/components/icons/MoneroIcon.tsx +++ b/src-gui/src/renderer/components/icons/MoneroIcon.tsx @@ -1,5 +1,5 @@ -import { SvgIcon } from "@material-ui/core"; -import { SvgIconProps } from "@material-ui/core/SvgIcon/SvgIcon"; +import { SvgIcon } from "@mui/material"; +import { SvgIconProps } from "@mui/material/SvgIcon/SvgIcon"; export default function MoneroIcon(props: SvgIconProps) { return ( diff --git a/src-gui/src/renderer/components/icons/TorIcon.tsx b/src-gui/src/renderer/components/icons/TorIcon.tsx index d83fbc899..7d4111cae 100644 --- a/src-gui/src/renderer/components/icons/TorIcon.tsx +++ b/src-gui/src/renderer/components/icons/TorIcon.tsx @@ -1,5 +1,5 @@ -import { SvgIcon } from "@material-ui/core"; -import { SvgIconProps } from "@material-ui/core/SvgIcon/SvgIcon"; +import { SvgIcon } from "@mui/material"; +import { SvgIconProps } from "@mui/material/SvgIcon/SvgIcon"; export default function TorIcon(props: SvgIconProps) { return ( diff --git a/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx b/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx index 62db22d4e..ef6cffa70 100644 --- a/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx +++ b/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx @@ -1,5 +1,5 @@ -import { TextField } from "@material-ui/core"; -import { TextFieldProps } from "@material-ui/core/TextField/TextField"; +import { TextField } from "@mui/material"; +import { TextFieldProps } from "@mui/material/TextField/TextField"; import { useEffect } from "react"; import { isTestnet } from "store/config"; import { isBtcAddressValid } from "utils/conversionUtils"; diff --git a/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx b/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx index dc62a5293..2c03c8289 100644 --- a/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx +++ b/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx @@ -1,5 +1,5 @@ -import { TextField } from "@material-ui/core"; -import { TextFieldProps } from "@material-ui/core/TextField/TextField"; +import { TextField } from "@mui/material"; +import { TextFieldProps } from "@mui/material/TextField/TextField"; import { useEffect } from "react"; import { isTestnet } from "store/config"; import { isXmrAddressValid } from "utils/conversionUtils"; diff --git a/src-gui/src/renderer/components/modal/DialogHeader.tsx b/src-gui/src/renderer/components/modal/DialogHeader.tsx index 043bef495..fa72030d1 100644 --- a/src-gui/src/renderer/components/modal/DialogHeader.tsx +++ b/src-gui/src/renderer/components/modal/DialogHeader.tsx @@ -1,4 +1,6 @@ -import { DialogTitle, makeStyles, Typography } from "@material-ui/core"; +import { DialogTitle, Typography } from "@mui/material"; + +import makeStyles from "@mui/styles/makeStyles"; const useStyles = makeStyles({ root: { @@ -15,7 +17,7 @@ export default function DialogHeader({ title }: DialogTitleProps) { const classes = useStyles(); return ( - + {title} ); diff --git a/src-gui/src/renderer/components/modal/PaperTextBox.tsx b/src-gui/src/renderer/components/modal/PaperTextBox.tsx index 9f37d44b6..f3d5f1466 100644 --- a/src-gui/src/renderer/components/modal/PaperTextBox.tsx +++ b/src-gui/src/renderer/components/modal/PaperTextBox.tsx @@ -1,4 +1,6 @@ -import { Button, makeStyles, Paper, Typography } from "@material-ui/core"; +import { Button, Paper, Typography } from "@mui/material"; + +import makeStyles from "@mui/styles/makeStyles"; const useStyles = makeStyles((theme) => ({ logsOuter: { diff --git a/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx b/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx index fb7a58845..62aaa6948 100644 --- a/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx +++ b/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx @@ -5,7 +5,7 @@ import { DialogContent, DialogContentText, DialogTitle, -} from "@material-ui/core"; +} from "@mui/material"; import { suspendCurrentSwap } from "renderer/rpc"; import PromiseInvokeButton from "../PromiseInvokeButton"; diff --git a/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx b/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx index 093b0384f..8b63f4cc5 100644 --- a/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx +++ b/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx @@ -9,7 +9,7 @@ import { MenuItem, Select, TextField, -} from "@material-ui/core"; +} from "@mui/material"; import { CliLog } from "models/cliModel"; import { useSnackbar } from "notistack"; import { useState } from "react"; diff --git a/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx b/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx index f8f6af2f9..83a352f40 100644 --- a/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx +++ b/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx @@ -7,10 +7,10 @@ import { DialogContent, DialogContentText, DialogTitle, - makeStyles, TextField, Theme, -} from "@material-ui/core"; +} from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { Multiaddr } from "multiaddr"; import { useSnackbar } from "notistack"; import { ChangeEvent, useState } from "react"; @@ -91,6 +91,7 @@ export default function ListSellersDialog({ discover providers and then connect and swap with them. ({ diff --git a/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx b/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx index 0a5415665..01f6c2d70 100644 --- a/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx +++ b/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx @@ -1,5 +1,5 @@ -import { Button } from "@material-ui/core"; -import { ButtonProps } from "@material-ui/core/Button/Button"; +import { Button } from "@mui/material"; +import { ButtonProps } from "@mui/material/Button/Button"; export default function ClipboardIconButton({ text, diff --git a/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx b/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx index c6ee589e1..96a17375a 100644 --- a/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx +++ b/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx @@ -1,5 +1,5 @@ -import { Box, Typography } from "@material-ui/core"; -import FileCopyOutlinedIcon from "@material-ui/icons/FileCopyOutlined"; +import { Box, Typography } from "@mui/material"; +import FileCopyOutlinedIcon from "@mui/icons-material/FileCopyOutlined"; import { ReactNode } from "react"; import BitcoinQrCode from "./BitcoinQrCode"; import ClipboardIconButton from "./ClipbiardIconButton"; diff --git a/src-gui/src/renderer/components/modal/swap/InfoBox.tsx b/src-gui/src/renderer/components/modal/swap/InfoBox.tsx index 23375600e..113c19274 100644 --- a/src-gui/src/renderer/components/modal/swap/InfoBox.tsx +++ b/src-gui/src/renderer/components/modal/swap/InfoBox.tsx @@ -1,10 +1,5 @@ -import { - Box, - LinearProgress, - makeStyles, - Paper, - Typography, -} from "@material-ui/core"; +import { Box, LinearProgress, Paper, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { ReactNode } from "react"; type Props = { diff --git a/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx b/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx index d6931403b..d098dde4f 100644 --- a/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx +++ b/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx @@ -1,10 +1,5 @@ -import { - Button, - Dialog, - DialogActions, - DialogContent, - makeStyles, -} from "@material-ui/core"; +import { Button, Dialog, DialogActions, DialogContent } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { useState } from "react"; import { swapReset } from "store/features/swapSlice"; import { useAppDispatch, useAppSelector, useIsSwapRunning } from "store/hooks"; diff --git a/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx b/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx index 351062c85..7880ececb 100644 --- a/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx +++ b/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx @@ -1,4 +1,5 @@ -import { Box, DialogTitle, makeStyles, Typography } from "@material-ui/core"; +import { Box, DialogTitle, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import DebugPageSwitchBadge from "./pages/DebugPageSwitchBadge"; import FeedbackSubmitBadge from "./pages/FeedbackSubmitBadge"; import TorStatusBadge from "./pages/TorStatusBadge"; @@ -28,7 +29,7 @@ export default function SwapDialogTitle({ const classes = useStyles(); return ( - + {title} diff --git a/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx b/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx index c9bcf6c97..9e98827b6 100644 --- a/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx +++ b/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx @@ -1,4 +1,4 @@ -import { Step, StepLabel, Stepper, Typography } from "@material-ui/core"; +import { Step, StepLabel, Stepper, Typography } from "@mui/material"; import { SwapSpawnType } from "models/cliModel"; import { BobStateName } from "models/tauriModelExt"; import { diff --git a/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx b/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx index 25c2d0355..478e0a313 100644 --- a/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx +++ b/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx @@ -1,4 +1,4 @@ -import { Link, Typography } from "@material-ui/core"; +import { Link, Typography } from "@mui/material"; import { ReactNode } from "react"; import InfoBox from "./InfoBox"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx index 00d068e2c..9355d2667 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import { useActiveSwapInfo, useAppSelector } from "store/hooks"; import JsonTreeView from "../../../other/JSONViewTree"; import CliLogsBox from "../../../other/RenderedCliLog"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx b/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx index 671ea2979..f9c6698f1 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx @@ -1,6 +1,6 @@ -import { Tooltip } from "@material-ui/core"; -import IconButton from "@material-ui/core/IconButton"; -import DeveloperBoardIcon from "@material-ui/icons/DeveloperBoard"; +import { Tooltip } from "@mui/material"; +import IconButton from "@mui/material/IconButton"; +import DeveloperBoardIcon from "@mui/icons-material/DeveloperBoard"; export default function DebugPageSwitchBadge({ enabled, @@ -18,6 +18,7 @@ export default function DebugPageSwitchBadge({ diff --git a/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx b/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx index 563840900..c9045fd30 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx @@ -1,5 +1,5 @@ -import { IconButton } from "@material-ui/core"; -import FeedbackIcon from "@material-ui/icons/Feedback"; +import { IconButton } from "@mui/material"; +import FeedbackIcon from "@mui/icons-material/Feedback"; import { useState } from "react"; import FeedbackDialog from "../../feedback/FeedbackDialog"; @@ -14,7 +14,7 @@ export default function FeedbackSubmitBadge() { onClose={() => setShowFeedbackDialog(false)} /> )} - setShowFeedbackDialog(true)}> + setShowFeedbackDialog(true)} size="large"> diff --git a/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx b/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx index f779d3d85..b3b83f136 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx @@ -1,4 +1,4 @@ -import { Box } from "@material-ui/core"; +import { Box } from "@mui/material"; import { SwapSlice } from "models/storeModel"; import CircularProgressWithSubtitle from "../CircularProgressWithSubtitle"; import BitcoinPunishedPage from "./done/BitcoinPunishedPage"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx b/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx index 9e968ecd4..47543d427 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx @@ -1,4 +1,4 @@ -import { IconButton, Tooltip } from "@material-ui/core"; +import { IconButton, Tooltip } from "@mui/material"; import { useAppSelector } from "store/hooks"; import TorIcon from "../../../icons/TorIcon"; @@ -8,7 +8,7 @@ export default function TorStatusBadge() { if (tor.processRunning) { return ( - + diff --git a/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx index a8507c3eb..9ef166c84 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import FeedbackInfoBox from "../../../../pages/help/FeedbackInfoBox"; export default function BitcoinPunishedPage() { diff --git a/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx index 4197d3c46..d3c2e349f 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import { TauriSwapProgressEventContent } from "models/tauriModelExt"; import { useActiveSwapInfo } from "store/hooks"; import FeedbackInfoBox from "../../../../pages/help/FeedbackInfoBox"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx index d499d33a0..441689ee0 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import { TauriSwapProgressEventContent } from "models/tauriModelExt"; import FeedbackInfoBox from "../../../../pages/help/FeedbackInfoBox"; import MoneroTransactionInfoBox from "../../MoneroTransactionInfoBox"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx b/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx index 62423d348..8b0ef597b 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import { SwapSpawnType } from "models/cliModel"; import { SwapStateProcessExited } from "models/storeModel"; import { useActiveSwapInfo, useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx index 75ebf88ae..c64e74d78 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import { TauriSwapProgressEventContent } from "models/tauriModelExt"; import SwapMightBeCancelledAlert from "../../../../alert/SwapMightBeCancelledAlert"; import BitcoinTransactionInfoBox from "../../BitcoinTransactionInfoBox"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx index f5c2615f1..627a61b69 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx @@ -1,4 +1,4 @@ -import { Box, DialogContentText } from "@material-ui/core"; +import { Box, DialogContentText } from "@mui/material"; import { TauriSwapProgressEventContent } from "models/tauriModelExt"; import MoneroTransactionInfoBox from "../../MoneroTransactionInfoBox"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx index 3a9135d4e..3205801c8 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx @@ -1,4 +1,5 @@ -import { Box, makeStyles, TextField, Typography } from "@material-ui/core"; +import { Box, TextField, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { BidQuote } from "models/tauriModel"; import { useState } from "react"; import { useAppSelector } from "store/hooks"; @@ -75,6 +76,7 @@ export default function DepositAmountHelper({ Depositing {bitcoinBalance > 0 && <>another} setAmount(btcToSats(parseFloat(e.target.value)))} diff --git a/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx index 11555fe35..b1df26fd6 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx @@ -1,5 +1,6 @@ -import { Box, DialogContentText, makeStyles } from "@material-ui/core"; -import PlayArrowIcon from "@material-ui/icons/PlayArrow"; +import { Box, DialogContentText } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import PlayArrowIcon from "@mui/icons-material/PlayArrow"; import { useState } from "react"; import BitcoinAddressTextField from "renderer/components/inputs/BitcoinAddressTextField"; import MoneroAddressTextField from "renderer/components/inputs/MoneroAddressTextField"; diff --git a/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx index 17cdc5fb7..4a1c38e57 100644 --- a/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx +++ b/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx @@ -1,4 +1,5 @@ -import { Box, makeStyles, Typography } from "@material-ui/core"; +import { Box, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { TauriSwapProgressEventContent } from "models/tauriModelExt"; import { useAppSelector } from "store/hooks"; import BitcoinIcon from "../../../../icons/BitcoinIcon"; diff --git a/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx index 4ae8f0204..d761931fd 100644 --- a/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx +++ b/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx @@ -1,4 +1,4 @@ -import { Button, Dialog, DialogActions } from "@material-ui/core"; +import { Button, Dialog, DialogActions } from "@mui/material"; import { useState } from "react"; import PromiseInvokeButton from "renderer/components/PromiseInvokeButton"; import { withdrawBtc } from "renderer/rpc"; diff --git a/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx index bf65b66dd..daed53c42 100644 --- a/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx +++ b/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx @@ -1,4 +1,5 @@ -import { Box, DialogContent, makeStyles } from "@material-ui/core"; +import { Box, DialogContent } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { ReactNode } from "react"; import WithdrawStepper from "./WithdrawStepper"; diff --git a/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx index edfbcafb2..8e2efb614 100644 --- a/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx +++ b/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx @@ -1,4 +1,4 @@ -import { Step, StepLabel, Stepper } from "@material-ui/core"; +import { Step, StepLabel, Stepper } from "@mui/material"; function getActiveStep(isPending: boolean, withdrawTxId: string | null) { if (isPending) { diff --git a/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx b/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx index 09102816e..cdf5d9528 100644 --- a/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx +++ b/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx @@ -1,4 +1,4 @@ -import { DialogContentText } from "@material-ui/core"; +import { DialogContentText } from "@mui/material"; import BitcoinAddressTextField from "../../../inputs/BitcoinAddressTextField"; export default function AddressInputPage({ diff --git a/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx b/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx index 45cf6b1be..db080a56c 100644 --- a/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx +++ b/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx @@ -1,4 +1,4 @@ -import { DialogContentText } from "@material-ui/core"; +import { DialogContentText } from "@mui/material"; import BitcoinTransactionInfoBox from "../../swap/BitcoinTransactionInfoBox"; export default function BtcTxInMempoolPageContent({ diff --git a/src-gui/src/renderer/components/navigation/Navigation.tsx b/src-gui/src/renderer/components/navigation/Navigation.tsx index 2e9c1c940..493728e4c 100644 --- a/src-gui/src/renderer/components/navigation/Navigation.tsx +++ b/src-gui/src/renderer/components/navigation/Navigation.tsx @@ -1,4 +1,5 @@ -import { Box, Drawer, makeStyles } from "@material-ui/core"; +import { Box, Drawer } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import NavigationFooter from "./NavigationFooter"; import NavigationHeader from "./NavigationHeader"; diff --git a/src-gui/src/renderer/components/navigation/NavigationFooter.tsx b/src-gui/src/renderer/components/navigation/NavigationFooter.tsx index 701cff623..50eaad90c 100644 --- a/src-gui/src/renderer/components/navigation/NavigationFooter.tsx +++ b/src-gui/src/renderer/components/navigation/NavigationFooter.tsx @@ -1,6 +1,7 @@ -import { Box, makeStyles } from "@material-ui/core"; -import GitHubIcon from "@material-ui/icons/GitHub"; -import RedditIcon from "@material-ui/icons/Reddit"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import GitHubIcon from "@mui/icons-material/GitHub"; +import RedditIcon from "@mui/icons-material/Reddit"; import FundsLeftInWalletAlert from "../alert/FundsLeftInWalletAlert"; import MoneroWalletRpcUpdatingAlert from "../alert/MoneroWalletRpcUpdatingAlert"; import UnfinishedSwapsAlert from "../alert/UnfinishedSwapsAlert"; diff --git a/src-gui/src/renderer/components/navigation/NavigationHeader.tsx b/src-gui/src/renderer/components/navigation/NavigationHeader.tsx index 848633e59..be032ce08 100644 --- a/src-gui/src/renderer/components/navigation/NavigationHeader.tsx +++ b/src-gui/src/renderer/components/navigation/NavigationHeader.tsx @@ -1,8 +1,8 @@ -import { Box, List } from "@material-ui/core"; -import AccountBalanceWalletIcon from "@material-ui/icons/AccountBalanceWallet"; -import HelpOutlineIcon from "@material-ui/icons/HelpOutline"; -import HistoryOutlinedIcon from "@material-ui/icons/HistoryOutlined"; -import SwapHorizOutlinedIcon from "@material-ui/icons/SwapHorizOutlined"; +import { Box, List } from "@mui/material"; +import AccountBalanceWalletIcon from "@mui/icons-material/AccountBalanceWallet"; +import HelpOutlineIcon from "@mui/icons-material/HelpOutline"; +import HistoryOutlinedIcon from "@mui/icons-material/HistoryOutlined"; +import SwapHorizOutlinedIcon from "@mui/icons-material/SwapHorizOutlined"; import RouteListItemIconButton from "./RouteListItemIconButton"; import UnfinishedSwapsBadge from "./UnfinishedSwapsCountBadge"; diff --git a/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx b/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx index 0df64d8b3..4ab2ee3cf 100644 --- a/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx +++ b/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx @@ -1,4 +1,4 @@ -import { ListItem, ListItemIcon, ListItemText } from "@material-ui/core"; +import { ListItem, ListItemIcon, ListItemText } from "@mui/material"; import { ReactNode } from "react"; import { useNavigate } from "react-router-dom"; diff --git a/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx b/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx index 973b123cf..3a9c52812 100644 --- a/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx +++ b/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx @@ -1,4 +1,4 @@ -import { Badge } from "@material-ui/core"; +import { Badge } from "@mui/material"; import { useResumeableSwapsCount } from "store/hooks"; export default function UnfinishedSwapsBadge({ diff --git a/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx b/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx index c8be76631..76782cacc 100644 --- a/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx +++ b/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx @@ -1,6 +1,6 @@ -import { Box, IconButton, TextField } from "@material-ui/core"; -import CloseIcon from "@material-ui/icons/Close"; -import SearchIcon from "@material-ui/icons/Search"; +import { Box, IconButton, TextField } from "@mui/material"; +import CloseIcon from "@mui/icons-material/Close"; +import SearchIcon from "@mui/icons-material/Search"; import { useState } from "react"; export function ExpandableSearchBox({ @@ -18,6 +18,7 @@ export function ExpandableSearchBox({ {expanded ? ( <> setQuery(e.target.value)} autoFocus diff --git a/src-gui/src/renderer/components/other/JSONViewTree.tsx b/src-gui/src/renderer/components/other/JSONViewTree.tsx index 87cf63b5b..d8ac9f049 100644 --- a/src-gui/src/renderer/components/other/JSONViewTree.tsx +++ b/src-gui/src/renderer/components/other/JSONViewTree.tsx @@ -1,7 +1,7 @@ -import ChevronRightIcon from "@material-ui/icons/ChevronRight"; -import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; -import TreeItem from "@material-ui/lab/TreeItem"; -import TreeView from "@material-ui/lab/TreeView"; +import ChevronRightIcon from "@mui/icons-material/ChevronRight"; +import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; +import TreeItem from "@mui/lab/TreeItem"; +import TreeView from "@mui/lab/TreeView"; import ScrollablePaperTextBox from "./ScrollablePaperTextBox"; interface JsonTreeViewProps { diff --git a/src-gui/src/renderer/components/other/LoadingButton.tsx b/src-gui/src/renderer/components/other/LoadingButton.tsx index beb13da81..aa60ee2f0 100644 --- a/src-gui/src/renderer/components/other/LoadingButton.tsx +++ b/src-gui/src/renderer/components/other/LoadingButton.tsx @@ -1,5 +1,5 @@ -import Button, { ButtonProps } from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; +import Button, { ButtonProps } from "@mui/material/Button"; +import CircularProgress from "@mui/material/CircularProgress"; import React from "react"; interface LoadingButtonProps extends ButtonProps { diff --git a/src-gui/src/renderer/components/other/RenderedCliLog.tsx b/src-gui/src/renderer/components/other/RenderedCliLog.tsx index 50e4bf9f5..60dfc37ae 100644 --- a/src-gui/src/renderer/components/other/RenderedCliLog.tsx +++ b/src-gui/src/renderer/components/other/RenderedCliLog.tsx @@ -1,4 +1,4 @@ -import { Box, Chip, Typography } from "@material-ui/core"; +import { Box, Chip, Typography } from "@mui/material"; import { CliLog } from "models/cliModel"; import { useMemo, useState } from "react"; import { logsToRawString } from "utils/parseUtils"; diff --git a/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx b/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx index 731e2d295..68342fcfa 100644 --- a/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx +++ b/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx @@ -1,7 +1,7 @@ -import { Box, Divider, IconButton, Paper, Typography } from "@material-ui/core"; -import FileCopyOutlinedIcon from "@material-ui/icons/FileCopyOutlined"; -import KeyboardArrowDownIcon from "@material-ui/icons/KeyboardArrowDown"; -import KeyboardArrowUpIcon from "@material-ui/icons/KeyboardArrowUp"; +import { Box, Divider, IconButton, Paper, Typography } from "@mui/material"; +import FileCopyOutlinedIcon from "@mui/icons-material/FileCopyOutlined"; +import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown"; +import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp"; import { ReactNode, useRef } from "react"; import { VList, VListHandle } from "virtua"; import { ExpandableSearchBox } from "./ExpandableSearchBox"; diff --git a/src-gui/src/renderer/components/other/Units.tsx b/src-gui/src/renderer/components/other/Units.tsx index b14b554b9..fbeba01fd 100644 --- a/src-gui/src/renderer/components/other/Units.tsx +++ b/src-gui/src/renderer/components/other/Units.tsx @@ -1,4 +1,4 @@ -import { Tooltip } from "@material-ui/core"; +import { Tooltip } from "@mui/material"; import { useAppSelector } from "store/hooks"; import { piconerosToXmr, satsToBtc } from "utils/conversionUtils"; diff --git a/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx b/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx index bda8efcd0..d0751432e 100644 --- a/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx @@ -1,4 +1,5 @@ -import { Box, Button, makeStyles, Typography } from "@material-ui/core"; +import { Box, Button, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import InfoBox from "../../modal/swap/InfoBox"; const useStyles = makeStyles((theme) => ({ diff --git a/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx b/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx index b87de9ccb..01f0db33f 100644 --- a/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx @@ -1,4 +1,4 @@ -import { Typography } from "@material-ui/core"; +import { Typography } from "@mui/material"; import MoneroIcon from "../../icons/MoneroIcon"; import DepositAddressInfoBox from "../../modal/swap/DepositAddressInfoBox"; diff --git a/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx b/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx index 19614337e..7d716c2a1 100644 --- a/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx @@ -1,4 +1,4 @@ -import { Button, Typography } from "@material-ui/core"; +import { Button, Typography } from "@mui/material"; import { useState } from "react"; import FeedbackDialog from "../../modal/feedback/FeedbackDialog"; import InfoBox from "../../modal/swap/InfoBox"; diff --git a/src-gui/src/renderer/components/pages/help/HelpPage.tsx b/src-gui/src/renderer/components/pages/help/HelpPage.tsx index bdce7292c..33e580c45 100644 --- a/src-gui/src/renderer/components/pages/help/HelpPage.tsx +++ b/src-gui/src/renderer/components/pages/help/HelpPage.tsx @@ -1,4 +1,5 @@ -import { Box, makeStyles } from "@material-ui/core"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import ContactInfoBox from "./ContactInfoBox"; import DonateInfoBox from "./DonateInfoBox"; import FeedbackInfoBox from "./FeedbackInfoBox"; diff --git a/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx b/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx index 571f41cd5..524936d98 100644 --- a/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx +++ b/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx @@ -1,7 +1,8 @@ -import { Box, makeStyles } from "@material-ui/core"; -import FolderOpenIcon from "@material-ui/icons/FolderOpen"; -import PlayArrowIcon from "@material-ui/icons/PlayArrow"; -import StopIcon from "@material-ui/icons/Stop"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import FolderOpenIcon from "@mui/icons-material/FolderOpen"; +import PlayArrowIcon from "@mui/icons-material/PlayArrow"; +import StopIcon from "@mui/icons-material/Stop"; import { RpcProcessStateType } from "models/rpcModel"; import PromiseInvokeButton from "renderer/components/PromiseInvokeButton"; import { useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx b/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx index cc4eab918..3eabbf02a 100644 --- a/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx @@ -1,6 +1,7 @@ -import { Box, makeStyles, Typography } from "@material-ui/core"; -import PlayArrowIcon from "@material-ui/icons/PlayArrow"; -import StopIcon from "@material-ui/icons/Stop"; +import { Box, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import PlayArrowIcon from "@mui/icons-material/PlayArrow"; +import StopIcon from "@mui/icons-material/Stop"; import PromiseInvokeButton from "renderer/components/PromiseInvokeButton"; import { useAppSelector } from "store/hooks"; import InfoBox from "../../modal/swap/InfoBox"; diff --git a/src-gui/src/renderer/components/pages/history/HistoryPage.tsx b/src-gui/src/renderer/components/pages/history/HistoryPage.tsx index 1ebe499b4..8ff9b7335 100644 --- a/src-gui/src/renderer/components/pages/history/HistoryPage.tsx +++ b/src-gui/src/renderer/components/pages/history/HistoryPage.tsx @@ -1,4 +1,4 @@ -import { Typography } from "@material-ui/core"; +import { Typography } from "@mui/material"; import { useAppSelector } from "store/hooks"; import SwapTxLockAlertsBox from "../../alert/SwapTxLockAlertsBox"; import SwapDialog from "../../modal/swap/SwapDialog"; diff --git a/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx index d325c93ab..071c2049d 100644 --- a/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx +++ b/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx @@ -1,14 +1,8 @@ -import { - Box, - Collapse, - IconButton, - makeStyles, - TableCell, - TableRow, -} from "@material-ui/core"; -import ArrowForwardIcon from "@material-ui/icons/ArrowForward"; -import KeyboardArrowDownIcon from "@material-ui/icons/KeyboardArrowDown"; -import KeyboardArrowUpIcon from "@material-ui/icons/KeyboardArrowUp"; +import { Box, Collapse, IconButton, TableCell, TableRow } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import ArrowForwardIcon from "@mui/icons-material/ArrowForward"; +import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown"; +import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp"; import { GetSwapInfoResponse } from "models/tauriModel"; import { useState } from "react"; import { PiconeroAmount, SatsAmount } from "../../../other/Units"; diff --git a/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx index a6428c72b..49bc70244 100644 --- a/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx +++ b/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx @@ -1,9 +1,9 @@ -import { Tooltip } from "@material-ui/core"; -import { ButtonProps } from "@material-ui/core/Button/Button"; -import { green, red } from "@material-ui/core/colors"; -import DoneIcon from "@material-ui/icons/Done"; -import ErrorIcon from "@material-ui/icons/Error"; -import PlayArrowIcon from "@material-ui/icons/PlayArrow"; +import { Tooltip } from "@mui/material"; +import { ButtonProps } from "@mui/material/Button/Button"; +import { green, red } from "@mui/material/colors"; +import DoneIcon from "@mui/icons-material/Done"; +import ErrorIcon from "@mui/icons-material/Error"; +import PlayArrowIcon from "@mui/icons-material/PlayArrow"; import { GetSwapInfoResponse } from "models/tauriModel"; import { BobStateName, diff --git a/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx index a691dc396..b54c5902c 100644 --- a/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx +++ b/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx @@ -1,13 +1,13 @@ import { Box, Link, - makeStyles, Table, TableBody, TableCell, TableContainer, TableRow, -} from "@material-ui/core"; +} from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { GetSwapInfoResponse } from "models/tauriModel"; import { MoneroBitcoinExchangeRate, diff --git a/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx index 43b012d0c..c06f4785d 100644 --- a/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx +++ b/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx @@ -1,6 +1,5 @@ import { Box, - makeStyles, Paper, Table, TableBody, @@ -8,7 +7,8 @@ import { TableContainer, TableHead, TableRow, -} from "@material-ui/core"; +} from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import { useSwapInfosSortedByDate } from "../../../../../store/hooks"; import HistoryRow from "./HistoryRow"; diff --git a/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx b/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx index 8d899b535..d6d4572b2 100644 --- a/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx +++ b/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx @@ -4,8 +4,8 @@ import { DialogActions, DialogContent, DialogTitle, -} from "@material-ui/core"; -import { ButtonProps } from "@material-ui/core/Button/Button"; +} from "@mui/material"; +import { ButtonProps } from "@mui/material/Button/Button"; import { CliLog } from "models/cliModel"; import { useState } from "react"; import PromiseInvokeButton from "renderer/components/PromiseInvokeButton"; diff --git a/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx b/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx index ad0ad51c7..1967b3e04 100644 --- a/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx +++ b/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx @@ -6,8 +6,8 @@ import { DialogContent, DialogContentText, Link, -} from "@material-ui/core"; -import { ButtonProps } from "@material-ui/core/Button/Button"; +} from "@mui/material"; +import { ButtonProps } from "@mui/material/Button/Button"; import { GetSwapInfoArgs } from "models/tauriModel"; import { rpcResetMoneroRecoveryKeys } from "store/features/rpcSlice"; import { useAppDispatch, useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx b/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx index 6819e83f7..cee038f37 100644 --- a/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx +++ b/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx @@ -1,5 +1,5 @@ -import { Box } from "@material-ui/core"; -import { Alert, AlertTitle } from "@material-ui/lab"; +import { Box } from "@mui/material"; +import { Alert, AlertTitle } from "@mui/material"; import { removeAlert } from "store/features/alertsSlice"; import { useAppDispatch, useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/pages/swap/SwapPage.tsx b/src-gui/src/renderer/components/pages/swap/SwapPage.tsx index bb3da695d..e7cc74427 100644 --- a/src-gui/src/renderer/components/pages/swap/SwapPage.tsx +++ b/src-gui/src/renderer/components/pages/swap/SwapPage.tsx @@ -1,4 +1,5 @@ -import { Box, makeStyles } from "@material-ui/core"; +import { Box } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; import ApiAlertsBox from "./ApiAlertsBox"; import SwapWidget from "./SwapWidget"; diff --git a/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx b/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx index cd85699c1..23a38048b 100644 --- a/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx +++ b/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx @@ -2,15 +2,15 @@ import { Box, Fab, LinearProgress, - makeStyles, Paper, TextField, Typography, -} from "@material-ui/core"; -import InputAdornment from "@material-ui/core/InputAdornment"; -import ArrowDownwardIcon from "@material-ui/icons/ArrowDownward"; -import SwapHorizIcon from "@material-ui/icons/SwapHoriz"; -import { Alert } from "@material-ui/lab"; +} from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import InputAdornment from "@mui/material/InputAdornment"; +import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward"; +import SwapHorizIcon from "@mui/icons-material/SwapHoriz"; +import { Alert } from "@mui/material"; import { ExtendedProviderStatus } from "models/apiModel"; import { ChangeEvent, useEffect, useState } from "react"; import { useAppSelector } from "store/hooks"; diff --git a/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx b/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx index d32fd9b4d..ec9bb86c5 100644 --- a/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx +++ b/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx @@ -1,5 +1,6 @@ -import { Box, makeStyles, Typography } from "@material-ui/core"; -import { Alert } from "@material-ui/lab"; +import { Box, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import { Alert } from "@mui/material"; import WithdrawWidget from "./WithdrawWidget"; const useStyles = makeStyles((theme) => ({ diff --git a/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx b/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx index 54a6c9a8e..0257ab0dc 100644 --- a/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx +++ b/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx @@ -1,4 +1,4 @@ -import RefreshIcon from "@material-ui/icons/Refresh"; +import RefreshIcon from "@mui/icons-material/Refresh"; import PromiseInvokeButton from "renderer/components/PromiseInvokeButton"; import { checkBitcoinBalance } from "renderer/rpc"; diff --git a/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx b/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx index 6cbcf9f9b..f2675550a 100644 --- a/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx +++ b/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx @@ -1,5 +1,6 @@ -import { Box, Button, makeStyles, Typography } from "@material-ui/core"; -import SendIcon from "@material-ui/icons/Send"; +import { Box, Button, Typography } from "@mui/material"; +import makeStyles from "@mui/styles/makeStyles"; +import SendIcon from "@mui/icons-material/Send"; import { RpcMethod } from "models/rpcModel"; import { useState } from "react"; import { SatsAmount } from "renderer/components/other/Units"; diff --git a/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx b/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx index bd2d071d1..f7d02d1ed 100644 --- a/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx +++ b/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx @@ -1,5 +1,5 @@ -import { IconButton, styled } from "@material-ui/core"; -import { Close } from "@material-ui/icons"; +import { IconButton, styled } from "@mui/material"; +import { Close } from "@mui/icons-material"; import { MaterialDesignContent, SnackbarKey, @@ -18,7 +18,7 @@ function CloseSnackbarButton({ snackbarId }: { snackbarId: SnackbarKey }) { const { closeSnackbar } = useSnackbar(); return ( - closeSnackbar(snackbarId)}> + closeSnackbar(snackbarId)} size="large"> ); diff --git a/src-gui/src/renderer/index.tsx b/src-gui/src/renderer/index.tsx index 80c12345a..1371d09b0 100644 --- a/src-gui/src/renderer/index.tsx +++ b/src-gui/src/renderer/index.tsx @@ -11,16 +11,10 @@ import { fetchXmrPrice, } from "./api"; import App from "./components/App"; -import { checkBitcoinBalance, getRawSwapInfos } from "./rpc"; import { store } from "./store/storeRenderer"; -setInterval(() => { - checkBitcoinBalance(); - getRawSwapInfos(); -}, 5000); - const container = document.getElementById("root"); -const root = createRoot(container!); +const root = createRoot(container); root.render( diff --git a/src-gui/src/store/hooks.ts b/src-gui/src/store/hooks.ts index c3ff6219a..63918fc0b 100644 --- a/src-gui/src/store/hooks.ts +++ b/src-gui/src/store/hooks.ts @@ -25,7 +25,7 @@ export function useIsSwapRunning() { export function useSwapInfo(swapId: string | null) { return useAppSelector((state) => - swapId ? (state.rpc.state.swapInfos[swapId] ?? null) : null, + swapId ? state.rpc.state.swapInfos[swapId] ?? null : null, ); } diff --git a/src-gui/vite.config.ts b/src-gui/vite.config.ts index 4a2412ecb..38e20f257 100644 --- a/src-gui/vite.config.ts +++ b/src-gui/vite.config.ts @@ -30,4 +30,7 @@ export default defineConfig(async () => ({ ignored: ["**/src-tauri/**"], }, }, + build: { + sourcemap: true, + }, })); diff --git a/src-gui/yarn.lock b/src-gui/yarn.lock index be7f5b943..46f6b9896 100644 --- a/src-gui/yarn.lock +++ b/src-gui/yarn.lock @@ -10,7 +10,7 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.24.7": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== @@ -87,7 +87,7 @@ dependencies: "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -178,7 +178,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.4.tgz#6ef37d678428306e7d75f054d5b1bdb8cf8aa8ee" + integrity sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w== + dependencies: + regenerator-runtime "^0.14.0" + +"@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== @@ -219,10 +226,112 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" -"@emotion/hash@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" - integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== +"@emotion/babel-plugin@^11.12.0": + version "11.12.0" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz#7b43debb250c313101b3f885eba634f1d723fcc2" + integrity sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw== + 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.2.0" + 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" + +"@emotion/cache@^11.11.0", "@emotion/cache@^11.13.0": + version "11.13.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7" + integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw== + dependencies: + "@emotion/memoize" "^0.9.0" + "@emotion/sheet" "^1.4.0" + "@emotion/utils" "^1.4.0" + "@emotion/weak-memoize" "^0.4.0" + stylis "4.2.0" + +"@emotion/hash@^0.9.1", "@emotion/hash@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" + integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g== + +"@emotion/is-prop-valid@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.3.0.tgz#bd84ba972195e8a2d42462387581560ef780e4e2" + integrity sha512-SHetuSLvJDzuNbOdtPVbq6yMMMlLoW5Q94uDqJZqy50gcmAjxFkVqmzqSGEFq9gT2iMuIeKV1PXVWmvUhuZLlQ== + dependencies: + "@emotion/memoize" "^0.9.0" + +"@emotion/memoize@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102" + integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ== + +"@emotion/react@^11.13.3": + version "11.13.3" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4" + integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg== + dependencies: + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.12.0" + "@emotion/cache" "^11.13.0" + "@emotion/serialize" "^1.3.1" + "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" + "@emotion/utils" "^1.4.0" + "@emotion/weak-memoize" "^0.4.0" + hoist-non-react-statics "^3.3.1" + +"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.1.tgz#490b660178f43d2de8e92b278b51079d726c05c3" + integrity sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA== + dependencies: + "@emotion/hash" "^0.9.2" + "@emotion/memoize" "^0.9.0" + "@emotion/unitless" "^0.10.0" + "@emotion/utils" "^1.4.0" + csstype "^3.0.2" + +"@emotion/sheet@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c" + integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg== + +"@emotion/styled@^11.13.0": + version "11.13.0" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.13.0.tgz#633fd700db701472c7a5dbef54d6f9834e9fb190" + integrity sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA== + dependencies: + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.12.0" + "@emotion/is-prop-valid" "^1.3.0" + "@emotion/serialize" "^1.3.0" + "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" + "@emotion/utils" "^1.4.0" + +"@emotion/unitless@^0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745" + integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg== + +"@emotion/use-insertion-effect-with-fallbacks@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz#1a818a0b2c481efba0cf34e5ab1e0cb2dcb9dfaf" + integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw== + +"@emotion/utils@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.0.tgz#262f1d02aaedb2ec91c83a0955dd47822ad5fbdd" + integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ== + +"@emotion/weak-memoize@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6" + integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg== "@esbuild/aix-ppc64@0.21.5": version "0.21.5" @@ -385,6 +494,33 @@ resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== +"@floating-ui/core@^1.6.0": + version "1.6.7" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.7.tgz#7602367795a390ff0662efd1c7ae8ca74e75fb12" + integrity sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g== + dependencies: + "@floating-ui/utils" "^0.2.7" + +"@floating-ui/dom@^1.0.0": + version "1.6.10" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.10.tgz#b74c32f34a50336c86dcf1f1c845cf3a39e26d6f" + integrity sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A== + dependencies: + "@floating-ui/core" "^1.6.0" + "@floating-ui/utils" "^0.2.7" + +"@floating-ui/react-dom@^2.0.8": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.1.tgz#cca58b6b04fc92b4c39288252e285e0422291fb0" + integrity sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg== + dependencies: + "@floating-ui/dom" "^1.0.0" + +"@floating-ui/utils@^0.2.7": + version "0.2.7" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.7.tgz#d0ece53ce99ab5a8e37ebdfe5e32452a2bfc073e" + integrity sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA== + "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" @@ -427,87 +563,134 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@material-ui/core@^4.12.4": - version "4.12.4" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73" - integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ== - 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" - -"@material-ui/icons@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1" - integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA== - dependencies: - "@babel/runtime" "^7.4.4" - -"@material-ui/lab@^4.0.0-alpha.61": - version "4.0.0-alpha.61" - resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz#9bf8eb389c0c26c15e40933cc114d4ad85e3d978" - integrity sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg== - 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" - -"@material-ui/styles@^4.11.5": - version "4.11.5" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb" - integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA== - 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" +"@mui/base@5.0.0-beta.40": + version "5.0.0-beta.40" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.40.tgz#1f8a782f1fbf3f84a961e954c8176b187de3dae2" + integrity sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ== + 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" + +"@mui/core-downloads-tracker@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz#182a325a520f7ebd75de051fceabfc0314cfd004" + integrity sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ== + +"@mui/icons-material@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.16.7.tgz#e27f901af792065efc9f3d75d74a66af7529a10a" + integrity sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q== + dependencies: + "@babel/runtime" "^7.23.9" + +"@mui/lab@^5.0.0-alpha.173": + version "5.0.0-alpha.173" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.173.tgz#a0f9696d93a765b48d69a7da5aaca0affa510ae8" + integrity sha512-Gt5zopIWwxDgGy/MXcp6GueD84xFFugFai4hYiXY0zowJpTVnIrTQCQXV004Q7rejJ7aaCntX9hpPJqCrioshA== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/base" "5.0.0-beta.40" + "@mui/system" "^5.16.5" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.5" + clsx "^2.1.0" + prop-types "^15.8.1" + +"@mui/material@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.16.7.tgz#6e814e2eefdaf065a769cecf549c3569e107a50b" + integrity sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/core-downloads-tracker" "^5.16.7" + "@mui/system" "^5.16.7" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.6" + "@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 "^18.3.1" + react-transition-group "^4.4.5" + +"@mui/private-theming@^5.16.6": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.16.6.tgz#547671e7ae3f86b68d1289a0b90af04dfcc1c8c9" + integrity sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/utils" "^5.16.6" + prop-types "^15.8.1" + +"@mui/styled-engine@^5.16.6": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.16.6.tgz#60110c106dd482dfdb7e2aa94fd6490a0a3f8852" + integrity sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g== + dependencies: + "@babel/runtime" "^7.23.9" + "@emotion/cache" "^11.11.0" + csstype "^3.1.3" + prop-types "^15.8.1" + +"@mui/styles@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.16.7.tgz#cf052f0243d283fab837d2505f4901e5207a0575" + integrity sha512-FfXhHP/2MlqH+vLs2tIHMeCChmqSRgkOALVNLKkPrDsvtoq5J8OraOutCn1scpvRjr9mO8ZhW6jKx2t/vUDxtQ== + dependencies: + "@babel/runtime" "^7.23.9" + "@emotion/hash" "^0.9.1" + "@mui/private-theming" "^5.16.6" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.6" + clsx "^2.1.0" + csstype "^3.1.3" 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" - -"@material-ui/system@^4.12.2": - version "4.12.2" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b" - integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw== - dependencies: - "@babel/runtime" "^7.4.4" - "@material-ui/utils" "^4.11.3" - csstype "^2.5.2" - prop-types "^15.7.2" - -"@material-ui/types@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" - integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== - -"@material-ui/utils@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942" - integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg== - dependencies: - "@babel/runtime" "^7.4.4" - prop-types "^15.7.2" - react-is "^16.8.0 || ^17.0.0" + 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" + +"@mui/system@^5.16.5", "@mui/system@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.16.7.tgz#4583ca5bf3b38942e02c15a1e622ba869ac51393" + integrity sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/private-theming" "^5.16.6" + "@mui/styled-engine" "^5.16.6" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.6" + clsx "^2.1.0" + csstype "^3.1.3" + prop-types "^15.8.1" + +"@mui/types@^7.2.14", "@mui/types@^7.2.15": + version "7.2.15" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.15.tgz#dadd232fe9a70be0d526630675dff3b110f30b53" + integrity sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q== + +"@mui/utils@^5.15.14", "@mui/utils@^5.16.5", "@mui/utils@^5.16.6": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711" + integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA== + 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 "^18.3.1" "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -530,6 +713,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@popperjs/core@^2.11.8": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@reduxjs/toolkit@^2.2.6": version "2.2.6" resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.2.6.tgz#4a8356dad9d0c1ab255607a555d492168e0e3bc1" @@ -751,7 +939,12 @@ dependencies: undici-types "~5.26.4" -"@types/prop-types@*": +"@types/parse-json@^4.0.0": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" + integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== + +"@types/prop-types@*", "@types/prop-types@^15.7.12": version "15.7.12" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6" integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q== @@ -763,14 +956,14 @@ dependencies: "@types/react" "*" -"@types/react-transition-group@^4.2.0": - version "4.4.10" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac" - integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q== +"@types/react-transition-group@^4.4.10": + version "4.4.11" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" + integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.2.15": +"@types/react@*": version "18.3.3" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== @@ -778,6 +971,14 @@ "@types/prop-types" "*" csstype "^3.0.2" +"@types/react@^18.3.1": + version "18.3.4" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.4.tgz#dfdd534a1d081307144c00e325c06e00312c93a3" + integrity sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + "@types/semver@^7.5.8": version "7.5.8" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" @@ -1025,6 +1226,15 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" +babel-plugin-macros@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" + integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg== + dependencies: + "@babel/runtime" "^7.12.5" + cosmiconfig "^7.0.0" + resolve "^1.19.0" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -1113,11 +1323,16 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -clsx@^1.0.4, clsx@^1.1.0: +clsx@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== +clsx@^2.1.0, clsx@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" + integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -1152,11 +1367,27 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +convert-source-map@^1.5.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== + convert-source-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== +cosmiconfig@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" + integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== + 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" + cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -1174,12 +1405,7 @@ css-vendor@^2.0.8: "@babel/runtime" "^7.8.3" is-in-browser "^1.0.2" -csstype@^2.5.2: - version "2.6.21" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" - integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== - -csstype@^3.0.2: +csstype@^3.0.2, csstype@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== @@ -1308,6 +1534,13 @@ err-code@^3.0.1: resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3: version "1.23.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" @@ -1670,6 +1903,11 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -1875,7 +2113,7 @@ help-me@^5.0.0: resolved "https://registry.yarnpkg.com/help-me/-/help-me-5.0.0.tgz#b1ebe63b967b74060027c2ac61f9be12d354a6f6" integrity sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg== -hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -1962,6 +2200,11 @@ is-array-buffer@^3.0.4: call-bind "^1.0.2" get-intrinsic "^1.2.1" +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + is-async-function@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" @@ -2189,6 +2432,11 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -2204,7 +2452,7 @@ json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jss-plugin-camel-case@^10.5.1: +jss-plugin-camel-case@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== @@ -2213,7 +2461,7 @@ jss-plugin-camel-case@^10.5.1: hyphenate-style-name "^1.0.3" jss "10.10.0" -jss-plugin-default-unit@^10.5.1: +jss-plugin-default-unit@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== @@ -2221,7 +2469,7 @@ jss-plugin-default-unit@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-global@^10.5.1: +jss-plugin-global@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== @@ -2229,7 +2477,7 @@ jss-plugin-global@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-nested@^10.5.1: +jss-plugin-nested@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== @@ -2238,7 +2486,7 @@ jss-plugin-nested@^10.5.1: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-props-sort@^10.5.1: +jss-plugin-props-sort@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== @@ -2246,7 +2494,7 @@ jss-plugin-props-sort@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-rule-value-function@^10.5.1: +jss-plugin-rule-value-function@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== @@ -2255,7 +2503,7 @@ jss-plugin-rule-value-function@^10.5.1: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-vendor-prefixer@^10.5.1: +jss-plugin-vendor-prefixer@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== @@ -2264,7 +2512,7 @@ jss-plugin-vendor-prefixer@^10.5.1: css-vendor "^2.0.8" jss "10.10.0" -jss@10.10.0, jss@^10.5.1: +jss@10.10.0, jss@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== @@ -2299,6 +2547,11 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -2558,6 +2811,16 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -2638,11 +2901,6 @@ pino@^9.2.0: sonic-boom "^4.0.1" thread-stream "^3.0.0" -popper.js@1.16.1-lts: - version "1.16.1-lts" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" - integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== - possible-typed-array-names@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" @@ -2672,7 +2930,7 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.6.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -2722,10 +2980,10 @@ react-is@^16.13.1, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -"react-is@^16.8.0 || ^17.0.0": - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-is@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== react-qr-code@^2.0.15: version "2.0.15" @@ -2763,7 +3021,7 @@ react-router@6.24.1: dependencies: "@remix-run/router" "1.17.1" -react-transition-group@^4.4.0: +react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== @@ -2773,7 +3031,7 @@ react-transition-group@^4.4.0: loose-envify "^1.4.0" prop-types "^15.6.2" -react@^18.2.0: +react@^18.3.1: version "18.3.1" resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== @@ -2851,6 +3109,15 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve@^1.19.0: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.5: version "2.0.0-next.5" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" @@ -3019,6 +3286,11 @@ source-map-js@^1.2.0: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== +source-map@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + split2@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" @@ -3102,6 +3374,11 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +stylis@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" + integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -3369,6 +3646,11 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"