Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #316

Merged
merged 16 commits into from
Sep 6, 2023
4 changes: 1 addition & 3 deletions src/App/ReceiveModal.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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({
Expand Down
17 changes: 4 additions & 13 deletions src/App/TermModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 1 addition & 3 deletions src/App/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/index.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
2 changes: 0 additions & 2 deletions src/components/ButtonSelect/index.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
23 changes: 0 additions & 23 deletions src/components/ChainIndicator/index.test.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/CircleDot/CircleDot.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/components/CloseButton/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactElement } from 'react'
import { ReactElement } from 'react'
import styled from 'styled-components'

const CloseButtonStyled = styled.button`
Expand Down
12 changes: 1 addition & 11 deletions src/components/ConnectWalletModal/styles.tsx
Original file line number Diff line number Diff line change
@@ -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};
Expand Down Expand Up @@ -46,4 +36,4 @@ const ImageTitle = styled.span`
text-align: left;
`

export { WalletList, ImageContainer, ImageItem, ImageTitle }
export { ImageContainer, ImageItem, ImageTitle, WalletList }
22 changes: 0 additions & 22 deletions src/components/CustomIconText/index.tsx

This file was deleted.

23 changes: 0 additions & 23 deletions src/components/DecodeTxs/__tests__/index.ts

This file was deleted.

24 changes: 0 additions & 24 deletions src/components/ExecuteCheckbox/index.test.tsx

This file was deleted.

12 changes: 6 additions & 6 deletions src/components/FeeAndSequence/index.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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()
Expand Down
71 changes: 0 additions & 71 deletions src/components/GlobalErrorBoundary/__tests__/index.test.ts

This file was deleted.

11 changes: 5 additions & 6 deletions src/components/GlobalErrorBoundary/index.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
60 changes: 0 additions & 60 deletions src/components/InfiniteScroll/index.tsx

This file was deleted.

Loading