Merge pull request #326 from aura-nw/euphoria

Euphoria

src/App/ReceiveModal.tsx

@@ -1,4 +1,3 @@
-import { Button, Text } from '@aura/safe-react-components'
 import IconButton from '@material-ui/core/IconButton'
 import { createStyles, makeStyles } from '@material-ui/core/styles'
 import Close from '@material-ui/icons/Close'
@@ -13,9 +12,8 @@ import Hairline from 'src/components/layout/Hairline'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import { getChainInfo, getExplorerInfo } from 'src/config'
-import { fontColor, lg, md, screenSm, secondaryText } from 'src/theme/variables'
+import { borderLinear, lg, md, screenSm, secondaryText } from 'src/theme/variables'
 import PrefixedEthHashInfo from '../components/PrefixedEthHashInfo'
-import { borderLinear } from 'src/theme/variables'
 const useStyles = (chainInfo: ChainInfo) =>
   makeStyles(
     createStyles({

src/App/TermModal.tsx

@@ -3,24 +3,15 @@ import { createStyles, makeStyles } from '@material-ui/core/styles'
 import Close from '@material-ui/icons/Close'
 import { ReactElement } from 'react'
 
-import styled from 'styled-components'
-import { useDispatch, useSelector } from 'react-redux'
 import { ChainInfo } from '@gnosis.pm/safe-react-gateway-sdk'
+import Logo from 'src/assets/icons/Logo.svg'
 import Hairline from 'src/components/layout/Hairline'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
-import { getChainInfo, getExplorerInfo } from 'src/config'
-import { fontColor, lg, md, screenSm, secondaryText } from 'src/theme/variables'
-import { borderLinear } from 'src/theme/variables'
-import Logo from 'src/assets/icons/Logo.svg'
-import session from 'src/utils/storage/session'
-import { store } from 'src/logic/safe/store'
-import { setTerm } from 'src/logic/checkTerm/store/actions/setTerm'
+import { getChainInfo } from 'src/config'
 import { handleConnectWallet } from 'src/logic/providers'
-
-import enqueueSnackbar from 'src/logic/notifications/store/actions/enqueueSnackbar'
-import { enhanceSnackbarForAction, NOTIFICATIONS } from 'src/logic/notifications'
-import { TermSelector } from 'src/logic/checkTerm/store/selector'
+import { borderLinear, lg, md, secondaryText } from 'src/theme/variables'
+import styled from 'styled-components'
 
 const useStyles = (chainInfo: ChainInfo) =>
   makeStyles(

src/App/index.tsx

@@ -76,7 +76,7 @@ const App: React.FC = ({ children }) => {
   const { name: safeName, totalFiatBalance: currentSafeBalance } = useSelector(currentSafeWithNames)
   const safeAddress = extractSafeAddress()
   const safeId = extractSafeId()
-  const { safeActionsState, onShow, onHide, showSendFunds, hideSendFunds } = useSafeActions()
+  const { onShow, showSendFunds } = useSafeActions()
   const { connectWalletState, onConnectWalletShow, onConnectWalletHide } = useConnectWallet()
   const currentCurrency = useSelector(currentCurrencySelector)
   const granted = useSelector(grantedSelector)
@@ -86,13 +86,11 @@ const App: React.FC = ({ children }) => {
   useSafeScheduledUpdates(safeAddress, safeId) // load every X seconds
   useAddressBookSync()
 
-  const sendFunds = safeActionsState.sendFunds
   const formattedTotalBalance = currentSafeBalance ? formatAmountInUsFormat(currentSafeBalance.toString()) : ''
   const balance =
     !!formattedTotalBalance && !!currentCurrency ? `${formattedTotalBalance} ${currentCurrency}` : undefined
 
   const onReceiveShow = () => onShow('Receive')
-  const onReceiveHide = () => onHide('Receive')
 
   const onTermHide = () => {
     termContext?.SetTerm(false)

src/components/Button/index.tsx

@@ -1,6 +1,6 @@
 import { Button } from '@aura/safe-react-components'
 import styled from 'styled-components'
-import { borderLinear, colorLinear } from 'src/theme/variables'
+import { borderLinear } from 'src/theme/variables'
 
 export const OutlinedButton = ({ children, ...rest }) => {
   return (

src/components/ButtonSelect/index.tsx

@@ -1,8 +1,6 @@
-import React from 'react'
 import { makeStyles } from '@material-ui/core/styles'
 import FormControl from '@material-ui/core/FormControl'
 import Select from '@material-ui/core/Select'
-import Input from '@material-ui/core/Input'
 import { borderLinear } from 'src/theme/variables'
 import CaretDown from './CaretDown.svg'
 import { MenuItem } from '@material-ui/core'

src/components/CircleDot/CircleDot.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react'
-import Dot from '@material-ui/icons/FiberManualRecord'
 import { getChainById } from 'src/config'
 import { ChainId } from 'src/config/chain.d'
 import styled from 'styled-components'

src/components/CloseButton/index.tsx

@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 import styled from 'styled-components'
 
 const CloseButtonStyled = styled.button`

src/components/ConnectWalletModal/styles.tsx

@@ -1,17 +1,7 @@
-import { createStyles } from '@material-ui/core'
 import styled from 'styled-components'
 import { lg } from '../../theme/variables'
 import Row from '../layout/Row'
 
-const styles = createStyles({
-  heading: {
-    padding: lg,
-    justifyContent: 'space-between',
-    maxHeight: '75px',
-    boxSizing: 'border-box',
-  },
-})
-
 const WalletList = styled.div`
   height: fit-content;
   padding: ${lg};
@@ -46,4 +36,4 @@ const ImageTitle = styled.span`
   text-align: left;
 `
 
-export { WalletList, ImageContainer, ImageItem, ImageTitle }
+export { ImageContainer, ImageItem, ImageTitle, WalletList }

src/components/FeeAndSequence/index.tsx

@@ -1,15 +1,15 @@
-import TextField from 'src/components/Input/TextField'
+import { useEffect } from 'react'
 import { useSelector } from 'react-redux'
+import ReloadIcon from 'src/assets/icons/reload.svg'
+import TextField from 'src/components/Input/TextField'
 import { getChainDefaultGasPrice, getCoinDecimal, getNativeCurrency } from 'src/config'
+import calculateGasFee from 'src/logic/providers/utils/fee'
 import { currentSafeWithNames } from 'src/logic/safe/store/selectors'
 import { formatNativeCurrency } from 'src/utils'
+import { usePagedQueuedTransactions } from 'src/utils/hooks/usePagedQueuedTransactions'
 import { FilledButton, LinkButton } from '../Button'
 import Gap from '../Gap'
-import ReloadIcon from 'src/assets/icons/reload.svg'
 import { Info, Wrap } from './styles'
-import { useState, useEffect } from 'react'
-import calculateGasFee from 'src/logic/providers/utils/fee'
-import { usePagedQueuedTransactions } from 'src/utils/hooks/usePagedQueuedTransactions'
 
 export default function FeeAndSequence({
   open,
@@ -22,7 +22,7 @@ export default function FeeAndSequence({
   setSequence,
 }) {
   const { nextQueueSeq, sequence: currentSequence } = useSelector(currentSafeWithNames)
-  const { count, isLoading, hasMore, next, transactions } = usePagedQueuedTransactions()
+  const { transactions } = usePagedQueuedTransactions()
 
   const nativeCurrency = getNativeCurrency()
   const chainDefaultGasPrice = getChainDefaultGasPrice()

src/components/GlobalErrorBoundary/index.tsx

@@ -1,12 +1,11 @@
-import styled from 'styled-components'
-import { Text, Link, Icon, FixedIcon, Title } from '@aura/safe-react-components'
-import { IS_PRODUCTION } from 'src/utils/constants'
 import { FallbackRender } from '@sentry/react/dist/errorboundary'
-import { ROOT_ROUTE } from 'src/routes/routes'
-import { loadFromSessionStorage, removeFromSessionStorage, saveToSessionStorage } from 'src/utils/storage/session'
+import { useState } from 'react'
 import Astronaut from 'src/assets/images/astronaut.png'
 import Space from 'src/assets/images/bg-space.png'
-import { useState } from 'react'
+import { ROOT_ROUTE } from 'src/routes/routes'
+import { IS_PRODUCTION } from 'src/utils/constants'
+import { loadFromSessionStorage, removeFromSessionStorage, saveToSessionStorage } from 'src/utils/storage/session'
+import styled from 'styled-components'
 import { LinkButton } from '../Button'
 const Wrapper = styled.div`
   width: 100vw;