Gateway :cleaningup emotions deps (#888)

* cleaning up import of useTheme from emotion * removed wallet address as not using * removed fox icon (cherry picked from commit 7abe704)
bobanetwork · Jul 31, 2023 · f527393 · f527393
1 parent de0f415
commit f527393
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 135 deletions.
diff --git a/packages/boba/gateway/src/components/icons/NetworkIcon.js b/packages/boba/gateway/src/components/icons/NetworkIcon.js
@@ -1,5 +1,5 @@
-import { useTheme } from "@emotion/react";
 import * as React from "react"
+import { useTheme } from "@mui/material";
 
 function NetworkIcon() {
   const theme = useTheme();

diff --git a/packages/boba/gateway/src/components/icons/NetworkSwitcherIcon.js b/packages/boba/gateway/src/components/icons/NetworkSwitcherIcon.js
@@ -1,5 +1,5 @@
-import { useTheme } from "@emotion/react";
 import * as React from "react"
+import { useTheme } from "@mui/material";
 
 function NetworkSwitcherIcon({ active }) {
   const theme = useTheme();

diff --git a/packages/boba/gateway/src/components/icons/SwapIcon.js b/packages/boba/gateway/src/components/icons/SwapIcon.js
@@ -1,4 +1,4 @@
-import { useTheme } from "@emotion/react";
+import { useTheme } from "@mui/material";
 import * as React from "react"
 
 function SwapIcon() {

diff --git a/packages/boba/gateway/src/components/input/Input.js b/packages/boba/gateway/src/components/input/Input.js
@@ -23,7 +23,8 @@ import { selectCustomStyles } from './Select.styles'
 import Button from 'components/button/Button'
 
 import { Box, Typography } from '@mui/material'
-import { useTheme } from '@emotion/react'
+import { useTheme } from "@mui/material";
+
 import { getCoinImage } from 'util/coinImage'
 
 function Input({

diff --git a/packages/boba/gateway/src/components/modal/Modal.js b/packages/boba/gateway/src/components/modal/Modal.js
@@ -22,12 +22,13 @@ import {
   Container,
   Box,
   useMediaQuery,
-  Grid
+  Grid,
+  useTheme
 } from '@mui/material'
 
 import * as S from "./Modal.styles"
 import * as LayoutS from 'components/common/common.styles';
-import { useTheme } from '@emotion/react'
+
 import { HighlightOffOutlined } from '@mui/icons-material';
 import CloseIcon from 'components/icons/CloseIcon';
 

diff --git a/packages/boba/gateway/src/components/pager/Pager.tsx b/packages/boba/gateway/src/components/pager/Pager.tsx
@@ -16,8 +16,9 @@ limitations under the License. */
 import React from 'react'
 import { NavigateNext, NavigateBefore } from '@mui/icons-material'
 
+import { useTheme } from '@mui/material'
+
 import * as S from './Pager.styles'
-import { useTheme } from '@emotion/react'
 
 interface PagerProps {
   currentPage: number

diff --git a/packages/boba/gateway/src/components/transaction/Transaction.js b/packages/boba/gateway/src/components/transaction/Transaction.js
@@ -15,13 +15,11 @@ limitations under the License. */
 
 import React, { useState } from 'react'
 
-import { Typography, Fade, useMediaQuery } from '@mui/material'
+import { Typography, Fade, useMediaQuery, useTheme } from '@mui/material'
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 
 import * as S from './Transaction.styles'
 
-import { useTheme } from '@emotion/react'
-
 import truncate from 'truncate-middle'
 import networkService from 'services/networkService'
 import { formatDate } from 'util/dates'

diff --git a/packages/boba/gateway/src/components/walletAddress/WalletAddress.js b/packages/boba/gateway/src/components/walletAddress/WalletAddress.js
diff --git a/packages/boba/gateway/src/components/walletAddress/WalletAddress.styles.js b/packages/boba/gateway/src/components/walletAddress/WalletAddress.styles.js
diff --git a/packages/boba/gateway/src/containers/earn/Earn.js b/packages/boba/gateway/src/containers/earn/Earn.js
@@ -18,12 +18,12 @@
 
 import React, { useState, useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux';
-import { useTheme } from '@emotion/react';
-import { Box, FormControlLabel, Checkbox, Typography, useMediaQuery } from '@mui/material'
+
+import { Box, FormControlLabel, Checkbox, Typography, useMediaQuery, useTheme } from '@mui/material'
 import { HelpOutline } from '@mui/icons-material'
 
-import { 
-  selectUserInfo, 
+import {
+  selectUserInfo,
   selectPoolInfo,
   selectlayer1Balance,
   selectlayer2Balance,
@@ -100,7 +100,7 @@ function Earn() {
 
   const selectedPoolInfo = lpChoice === 'L1LP' ? poolInfo.L1LP : poolInfo.L2LP;
   const selectedNetworkConfig = lpChoice === 'L1LP' ? networkService?.networkConfig?.L1?.chainIdHex : networkService?.networkConfig?.L2?.chainIdHex;
-  
+
   return (
     <S.EarnPageContainer>
       <PageTitle title={'Earn'} />

diff --git a/packages/boba/gateway/src/containers/earn/EarnWrapper.js b/packages/boba/gateway/src/containers/earn/EarnWrapper.js
@@ -1,6 +1,4 @@
-
-import { useTheme } from '@emotion/react';
-import { useMediaQuery } from '@mui/material';
+import { useMediaQuery, useTheme } from '@mui/material';
 import React from 'react';
 import Earn from './Earn';
 

diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStep.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStep.js
@@ -12,8 +12,8 @@ import Input from 'components/input/Input'
 import { selectLoading, selectLookupPrice, selectActiveNetworkName } from 'selectors'
 import { amountToUsd, logAmount, toWei_String } from 'util/amountConvert'
 
-import { useTheme } from '@emotion/react'
-import { Box, Checkbox, FormControlLabel, Typography, useMediaQuery } from '@mui/material'
+
+import { Box, Checkbox, FormControlLabel, Typography, useMediaQuery, useTheme } from '@mui/material'
 import { WrapperActionsModal } from 'components/modal/Modal.styles'
 
 import BN from 'bignumber.js'

diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepBatch.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepBatch.js
@@ -15,9 +15,9 @@ limitations under the License. */
 
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { useTheme } from '@emotion/react'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
+
+import { Box, Typography, useMediaQuery,useTheme } from '@mui/material'
 
 import { depositL1LPBatch, approveFastDepositBatch, fetchBalances } from 'actions/networkAction'
 import { utils } from 'ethers'
@@ -31,8 +31,8 @@ import { CounterButton } from 'components';
 
 import { WrapperActionsModal } from 'components/modal/Modal.styles'
 
-import { 
-  selectLoading, 
+import {
+  selectLoading,
   selectSignatureStatus_depositLP,
   selectlayer1Balance,
   selectFastDepositBatchCost,

diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepFast.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepFast.js
@@ -16,9 +16,9 @@ limitations under the License. */
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
-import { useTheme } from '@emotion/react'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
+
+import { Box, Typography, useMediaQuery,useTheme } from '@mui/material'
 
 import { depositL1LP, approveERC20 } from 'actions/networkAction'
 

diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js
@@ -15,8 +15,8 @@ import {
 } from 'util/amountConvert'
 import { getCoinImage } from 'util/coinImage'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
-import { useTheme } from '@emotion/react'
+import { Box, Typography, useMediaQuery, useTheme} from '@mui/material'
+
 import { WrapperActionsModal } from 'components/modal/Modal.styles'
 
 import BN from 'bignumber.js'

diff --git a/packages/boba/gateway/src/containers/modals/exit/steps/DoExitStep.js b/packages/boba/gateway/src/containers/modals/exit/steps/DoExitStep.js
@@ -17,9 +17,9 @@ import React, { useState, useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { utils } from 'ethers'
 
-import { useTheme } from '@emotion/react'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
+
+import { Box, Typography, useMediaQuery,useTheme } from '@mui/material'
 
 import { exitBOBA } from 'actions/networkAction'
 import { openModal } from 'actions/uiAction'
@@ -29,9 +29,9 @@ import Button from 'components/button/Button'
 import Input from 'components/input/Input'
 import BridgeFee from 'components/bridgeFee/BridgeFee'
 
-import { 
-  selectLoading, 
-  selectSignatureStatus_exitTRAD, 
+import {
+  selectLoading,
+  selectSignatureStatus_exitTRAD,
   selectLookupPrice,
   selectBobaFeeChoice,
   selectBobaPriceRatio,

diff --git a/packages/boba/gateway/src/containers/modals/exit/steps/DoExitStepFast.js b/packages/boba/gateway/src/containers/modals/exit/steps/DoExitStepFast.js
@@ -21,7 +21,7 @@ import { depositL2LP } from 'actions/networkAction'
 import { openModal } from 'actions/uiAction'
 import { setCDMCompletion } from 'actions/transactionAction'
 
-import { 
+import {
   selectLoading,
   selectSignatureStatus_exitLP,
   selectLookupPrice,
@@ -44,8 +44,8 @@ import BridgeFee from 'components/bridgeFee/BridgeFee'
 
 import { amountToUsd, logAmount, toWei_String } from 'util/amountConvert'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
-import { useTheme } from '@emotion/react'
+import { Box, Typography, useMediaQuery,useTheme } from '@mui/material'
+
 import { WrapperActionsModal } from 'components/modal/Modal.styles'
 
 import BN from 'bignumber.js'

diff --git a/packages/boba/gateway/src/containers/modals/transfer/TransferModal.js b/packages/boba/gateway/src/containers/modals/transfer/TransferModal.js
@@ -18,8 +18,8 @@ import { useDispatch, useSelector } from 'react-redux'
 
 import { transfer } from 'actions/networkAction'
 import { closeModal, openAlert } from 'actions/uiAction'
-import { 
-  selectLoading, 
+import {
+  selectLoading,
   selectLookupPrice,
   selectBobaFeeChoice,
   selectBobaPriceRatio,
@@ -31,8 +31,8 @@ import { BigNumber, utils } from 'ethers'
 
 import BN from 'bignumber.js'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
-import { useTheme } from '@emotion/react'
+import { Box, Typography, useMediaQuery,useTheme } from '@mui/material'
+
 
 import Button from 'components/button/Button'
 import Modal from 'components/modal/Modal'

diff --git a/packages/boba/gateway/src/containers/modals/transfer/TransferNFTModal.js b/packages/boba/gateway/src/containers/modals/transfer/TransferNFTModal.js
@@ -20,8 +20,8 @@ import { transferNFT } from 'actions/networkAction'
 import { closeModal, openAlert } from 'actions/uiAction'
 import { selectLoading } from 'selectors'
 
-import { Box, Typography, useMediaQuery } from '@mui/material'
-import { useTheme } from '@emotion/react'
+import { Box, Typography, useMediaQuery,useTheme } from '@mui/material'
+
 
 import Button from 'components/button/Button'
 import Modal from 'components/modal/Modal'

diff --git a/packages/boba/gateway/src/containers/save/SaveWrapper.js b/packages/boba/gateway/src/containers/save/SaveWrapper.js
@@ -1,5 +1,4 @@
-import { useTheme } from '@emotion/react'
-import { useMediaQuery } from '@mui/material'
+import { useMediaQuery,useTheme } from '@mui/material'
 import React from 'react'
 import Save from './Save'