Skip to content

Commit

Permalink
Absolute imports alias @
Browse files Browse the repository at this point in the history
  • Loading branch information
katspaugh committed Apr 18, 2022
1 parent 374c108 commit bfb9078
Show file tree
Hide file tree
Showing 41 changed files with 107 additions and 111 deletions.
4 changes: 2 additions & 2 deletions components/balances/AssetsTable/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SafeBalanceResponse } from '@gnosis.pm/safe-react-gateway-sdk'
import { Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from '@mui/material'
import { ReactElement } from 'react'
import FiatValue from 'components/common/FiatValue'
import TokenAmount, { TokenIcon } from 'components/common/TokenAmount'
import FiatValue from '@/components/common/FiatValue'
import TokenAmount, { TokenIcon } from '@/components/common/TokenAmount'

interface AssetsTableProps {
items?: SafeBalanceResponse['items']
Expand Down
2 changes: 1 addition & 1 deletion components/balances/CurrencySelect/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactElement } from 'react'
import { FormControl, InputLabel, MenuItem, Select, SelectChangeEvent } from '@mui/material'
import { useAppDispatch, useAppSelector } from 'store'
import { selectCurrency, setCurrency } from 'store/currencySlice'
import { selectCurrency, setCurrency } from '@/store/currencySlice'
import useCurriencies from './useCurrencies'
import css from './styles.module.css'

Expand Down
6 changes: 3 additions & 3 deletions components/balances/CurrencySelect/useCurrencies.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect } from 'react'
import { getFiatCurrencies, FiatCurrencies } from '@gnosis.pm/safe-react-gateway-sdk'
import { GATEWAY_URL } from 'config/constants'
import useAsync from 'services/useAsync'
import { Errors, logError } from 'services/exceptions'
import { GATEWAY_URL } from '@/config/constants'
import useAsync from '@/services/useAsync'
import { Errors, logError } from '@/services/exceptions'

const fetchCurrencies = () => {
return getFiatCurrencies(GATEWAY_URL)
Expand Down
4 changes: 2 additions & 2 deletions components/common/ChainIndicator/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactElement, useMemo } from 'react'
import useSafeAddress from 'services/useSafeAddress'
import useSafeAddress from '@/services/useSafeAddress'
import { useAppSelector } from 'store'
import { selectChainById } from 'store/chainsSlice'
import { selectChainById } from '@/store/chainsSlice'

const ChainIndicator = (): ReactElement => {
const { chainId } = useSafeAddress()
Expand Down
2 changes: 1 addition & 1 deletion components/common/DateTime/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactElement, useMemo } from 'react'
import useBrowserLocale from 'services/useBrowserLocale'
import useBrowserLocale from '@/services/useBrowserLocale'

const DateTime = ({
value,
Expand Down
4 changes: 2 additions & 2 deletions components/common/FiatValue/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactElement, useMemo } from 'react'
import useBrowserLocale from 'services/useBrowserLocale'
import useBrowserLocale from '@/services/useBrowserLocale'
import { useAppSelector } from 'store'
import { selectCurrency } from 'store/currencySlice'
import { selectCurrency } from '@/store/currencySlice'

const FiatValue = ({ value }: { value: string | number }): ReactElement => {
const locale = useBrowserLocale()
Expand Down
6 changes: 3 additions & 3 deletions components/common/SafeHeader/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ReactElement } from 'react'
import { connect } from 'react-redux'
import { shortenAddress } from 'services/formatters'
import { selectBalances } from 'store/balancesSlice'
import { selectSafeInfo } from 'store/safeInfoSlice'
import { shortenAddress } from '@/services/formatters'
import { selectBalances } from '@/store/balancesSlice'
import { selectSafeInfo } from '@/store/safeInfoSlice'
import { RootState } from '../../../store'
import FiatValue from '../FiatValue'
import Identicon from '../Identicon'
Expand Down
10 changes: 5 additions & 5 deletions components/common/SafeList/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { getOwnedSafes, OwnedSafes } from '@gnosis.pm/safe-react-gateway-sdk'
import Web3 from 'web3'
import { GATEWAY_URL } from 'config/constants'
import { GATEWAY_URL } from '@/config/constants'
import { ReactElement } from 'react'
import useAsync from 'services/useAsync'
import useAsync from '@/services/useAsync'
import css from './styles.module.css'
import Link from 'next/link'
import chains from 'config/chains'
import useSafeAddress from 'services/useSafeAddress'
import { shortenAddress } from 'services/formatters'
import chains from '@/config/chains'
import useSafeAddress from '@/services/useSafeAddress'
import { shortenAddress } from '@/services/formatters'

const getOwned = (chainId: string, walletAddress: string): Promise<OwnedSafes> => {
return getOwnedSafes(GATEWAY_URL, chainId, walletAddress)
Expand Down
4 changes: 2 additions & 2 deletions components/common/Sidebar/Navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import ExpandLess from '@mui/icons-material/ExpandLess'
import ExpandMore from '@mui/icons-material/ExpandMore'
import List from '@mui/material/List'

import useSafeAddress from 'services/useSafeAddress'
import chains from 'config/chains'
import useSafeAddress from '@/services/useSafeAddress'
import chains from '@/config/chains'
import { useRouter } from 'next/router'

type NavItem = {
Expand Down
6 changes: 3 additions & 3 deletions components/common/Sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { ReactElement, useState } from 'react'
import { Button } from '@mui/material'

import { useAppSelector } from 'store'
import { selectSafeInfo } from 'store/safeInfoSlice'
import { selectSafeInfo } from '@/store/safeInfoSlice'
import ChainIndicator from '../ChainIndicator'
import SafeHeader from '../SafeHeader'
import SafeList from '../SafeList'
import ErrorToast from '../ErrorToast'
import css from './styles.module.css'
import TxModal from 'components/tx/TxModal'
import Navigation from 'components/common/Sidebar/Navigation'
import TxModal from '@/components/tx/TxModal'
import Navigation from '@/components/common/Sidebar/Navigation'

const Sidebar = (): ReactElement => {
const [txOpen, setTxOpen] = useState<boolean>(false)
Expand Down
2 changes: 1 addition & 1 deletion components/common/TokenAmount/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type ReactElement } from 'react'
import { TransferDirection } from '@gnosis.pm/safe-react-gateway-sdk'
import { formatDecimals } from 'services/formatters'
import { formatDecimals } from '@/services/formatters'
import css from './styles.module.css'

export const TokenIcon = (props: { logoUri?: string | null; tokenSymbol?: string | null }): ReactElement | null => {
Expand Down
2 changes: 1 addition & 1 deletion components/transactions/SignTxButton/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type TransactionSummary } from '@gnosis.pm/safe-react-gateway-sdk'
import { Button } from '@mui/material'
import TxModal from 'components/tx/TxModal'
import TxModal from '@/components/tx/TxModal'
import { useState, type ReactElement } from 'react'
import css from './styles.module.css'

Expand Down
2 changes: 1 addition & 1 deletion components/transactions/TxDateLabel/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DateLabel } from '@gnosis.pm/safe-react-gateway-sdk'
import DateTime from 'components/common/DateTime'
import DateTime from '@/components/common/DateTime'
import { ReactElement } from 'react'
import css from './styles.module.css'

Expand Down
8 changes: 4 additions & 4 deletions components/transactions/TxInfo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
TransferDirection,
} from '@gnosis.pm/safe-react-gateway-sdk'
import { useAppSelector } from 'store'
import { selectChainById } from 'store/chainsSlice'
import useSafeAddress from 'services/useSafeAddress'
import TokenAmount from 'components/common/TokenAmount'
import { shortenAddress } from 'services/formatters'
import { selectChainById } from '@/store/chainsSlice'
import useSafeAddress from '@/services/useSafeAddress'
import TokenAmount from '@/components/common/TokenAmount'
import { shortenAddress } from '@/services/formatters'

const TransferTx = ({ info }: { info: Transfer }): ReactElement => {
const { chainId } = useSafeAddress()
Expand Down
4 changes: 2 additions & 2 deletions components/transactions/TxSummary/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { type ReactElement } from 'react'
import { MultisigExecutionInfo, Transaction, TransactionStatus } from '@gnosis.pm/safe-react-gateway-sdk'
import { Grid, Paper } from '@mui/material'
import DateTime from 'components/common/DateTime'
import DateTime from '@/components/common/DateTime'
import css from './styles.module.css'
import TxInfo from '../TxInfo'
import { useWalletAddress } from 'services/useSafeSDK'
import { useWalletAddress } from '@/services/useSafeSDK'
import SignTxButton from '../SignTxButton'

type TxSummaryProps = {
Expand Down
6 changes: 3 additions & 3 deletions components/tx/FinishTx/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { type SafeTransaction } from '@gnosis.pm/safe-core-sdk-types'
import { Typography } from '@mui/material'
import ErrorToast from 'components/common/ErrorToast'
import ErrorToast from '@/components/common/ErrorToast'
import { useEffect, useState, type ReactElement } from 'react'
import proposeTx from 'services/proposeTransaction'
import useSafeAddress from 'services/useSafeAddress'
import proposeTx from '@/services/proposeTransaction'
import useSafeAddress from '@/services/useSafeAddress'
import css from './styles.module.css'

const FinishTx = ({ tx }: { tx: SafeTransaction }): ReactElement => {
Expand Down
12 changes: 6 additions & 6 deletions components/tx/ReviewTx/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { type SafeTransaction } from '@gnosis.pm/safe-core-sdk-types'
import { type TokenInfo } from '@gnosis.pm/safe-react-gateway-sdk'
import { type SendAssetsFormData } from '../SendAssetsForm'
import { Button, FormControl, TextField, Typography } from '@mui/material'
import { TokenIcon } from 'components/common/TokenAmount'
import { createTokenTransferParams, createTransaction } from 'services/createTransaction'
import { shortenAddress } from 'services/formatters'
import { TokenIcon } from '@/components/common/TokenAmount'
import { createTokenTransferParams, createTransaction } from '@/services/createTransaction'
import { shortenAddress } from '@/services/formatters'
import { useAppSelector } from 'store'
import { selectBalances } from 'store/balancesSlice'
import { selectBalances } from '@/store/balancesSlice'
import { useForm, type FieldValues } from 'react-hook-form'
import css from './styles.module.css'
import ErrorToast from 'components/common/ErrorToast'
import useSafeTxGas from 'services/useSafeTxGas'
import ErrorToast from '@/components/common/ErrorToast'
import useSafeTxGas from '@/services/useSafeTxGas'

const TokenTransferReview = ({ params, tokenInfo }: { params: SendAssetsFormData; tokenInfo: TokenInfo }) => {
return (
Expand Down
8 changes: 4 additions & 4 deletions components/tx/SendAssetsForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { useForm, type FieldValues } from 'react-hook-form'

import css from './styles.module.css'
import { useAppSelector } from 'store'
import { selectBalances } from 'store/balancesSlice'
import TokenAmount, { TokenIcon } from 'components/common/TokenAmount'
import { formatDecimals, toDecimals } from 'services/formatters'
import { validateAddress } from 'services/validation'
import { selectBalances } from '@/store/balancesSlice'
import TokenAmount, { TokenIcon } from '@/components/common/TokenAmount'
import { formatDecimals, toDecimals } from '@/services/formatters'
import { validateAddress } from '@/services/validation'

export type SendAssetsFormData = {
recepient: string
Expand Down
18 changes: 7 additions & 11 deletions components/tx/SignProposedTx/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { type SafeTransaction } from '@gnosis.pm/safe-core-sdk-types'
import { getTransactionDetails, TransactionSummary } from '@gnosis.pm/safe-react-gateway-sdk'
import { Button, Typography } from '@mui/material'
import ErrorToast from 'components/common/ErrorToast'
import { GATEWAY_URL } from 'config/constants'
import ErrorToast from '@/components/common/ErrorToast'
import { GATEWAY_URL } from '@/config/constants'
import { ReactElement, useState } from 'react'
import { createTransaction, signTransaction } from 'services/createTransaction'
import extractTxInfo from 'services/extractTxInfo'
import useSafeAddress from 'services/useSafeAddress'
import { createTransaction, signTransaction } from '@/services/createTransaction'
import extractTxInfo from '@/services/extractTxInfo'
import useSafeAddress from '@/services/useSafeAddress'
import css from './styles.module.css'

const getTxDetails = async (chainId: string, id: string) => {
Expand Down Expand Up @@ -44,12 +44,8 @@ const SignProposedTx = ({
<div className={css.container}>
<Typography variant="h6">Confirm transaction</Typography>

<div>
Transaction id
</div>
<pre style={{ overflow: 'auto', width: '100%' }}>
{txSummary.id}
</pre>
<div>Transaction id</div>
<pre style={{ overflow: 'auto', width: '100%' }}>{txSummary.id}</pre>

<div className={css.submit}>
<Button variant="contained" onClick={onSign}>
Expand Down
4 changes: 2 additions & 2 deletions components/tx/SignTx/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { type SafeTransaction } from '@gnosis.pm/safe-core-sdk-types'
import { Button, Typography } from '@mui/material'
import ErrorToast from 'components/common/ErrorToast'
import ErrorToast from '@/components/common/ErrorToast'
import { ReactElement, useState } from 'react'
import { signTransaction } from 'services/createTransaction'
import { signTransaction } from '@/services/createTransaction'
import css from './styles.module.css'

const SignTx = ({ tx, onSubmit }: { tx: SafeTransaction; onSubmit: (tx: SafeTransaction) => void }): ReactElement => {
Expand Down
2 changes: 1 addition & 1 deletion pages/404.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { NextPage } from 'next'
import { useQueryRewrite } from 'services/usePathRewrite'
import { useQueryRewrite } from '@/services/usePathRewrite'

const Custom404: NextPage = () => {
const isRedirecting = useQueryRewrite()
Expand Down
20 changes: 10 additions & 10 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import Head from 'next/head'
import { Provider } from 'react-redux'
import '../styles/globals.css'
import { store } from 'store'
import PageLayout from 'components/common/PageLayout'
import useChains from 'services/useChains'
import useSafeInfo from 'services/useSafeInfo'
import useBalances from 'services/useBalances'
import useTxHistory from 'services/useTxHistory'
import useTxQueue from 'services/useTxQueue'
import { useWeb3 } from 'services/useWeb3'
import { useSafeSDK } from 'services/useSafeSDK'
import { useWeb3ReadOnly } from 'services/useWeb3ReadOnly'
import usePathRewrite from 'services/usePathRewrite'
import PageLayout from '@/components/common/PageLayout'
import useChains from '@/services/useChains'
import useSafeInfo from '@/services/useSafeInfo'
import useBalances from '@/services/useBalances'
import useTxHistory from '@/services/useTxHistory'
import useTxQueue from '@/services/useTxQueue'
import { useWeb3 } from '@/services/useWeb3'
import { useSafeSDK } from '@/services/useSafeSDK'
import { useWeb3ReadOnly } from '@/services/useWeb3ReadOnly'
import usePathRewrite from '@/services/usePathRewrite'

const InitApp = (): null => {
usePathRewrite()
Expand Down
6 changes: 3 additions & 3 deletions pages/safe/balances/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { NextPage } from 'next'

import { useAppSelector } from 'store'
import { selectBalances } from 'store/balancesSlice'
import AssetsTable from 'components/balances/AssetsTable'
import CurrencySelect from 'components/balances/CurrencySelect'
import { selectBalances } from '@/store/balancesSlice'
import AssetsTable from '@/components/balances/AssetsTable'
import CurrencySelect from '@/components/balances/CurrencySelect'

const Balances: NextPage = () => {
const balances = useAppSelector(selectBalances)
Expand Down
4 changes: 2 additions & 2 deletions pages/safe/transactions/history.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import TxList from 'components/transactions/TxList'
import TxList from '@/components/transactions/TxList'
import type { NextPage } from 'next'
import { useAppDispatch, useAppSelector } from 'store'
import { selectTxHistory, setPageUrl } from 'store/txHistorySlice'
import { selectTxHistory, setPageUrl } from '@/store/txHistorySlice'

const preventDefault = (fn: () => void): ((e: React.SyntheticEvent) => void) => {
return (e) => {
Expand Down
4 changes: 2 additions & 2 deletions pages/safe/transactions/queue.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import TxList from 'components/transactions/TxList'
import TxList from '@/components/transactions/TxList'
import type { NextPage } from 'next'
import { useAppDispatch, useAppSelector } from 'store'
import { selectTxQueue, setPageUrl } from 'store/txQueueSlice'
import { selectTxQueue, setPageUrl } from '@/store/txQueueSlice'

const preventDefault = (fn: () => void): ((e: React.SyntheticEvent) => void) => {
return (e) => {
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion services/createTransaction.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { SafeTransaction, SafeTransactionDataPartial } from '@gnosis.pm/safe-core-sdk-types'
import { getSafeSDK, getWeb3ReadOnly } from 'utils/web3'
import { getSafeSDK, getWeb3ReadOnly } from '@/services/web3'
import { erc20Transfer } from './abi'
import { toDecimals } from './formatters'

Expand Down
4 changes: 2 additions & 2 deletions services/proposeTransaction.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Web3 from 'web3'
import type { SafeTransaction } from '@gnosis.pm/safe-core-sdk-types'
import { Operation, proposeTransaction } from '@gnosis.pm/safe-react-gateway-sdk'
import { GATEWAY_URL } from 'config/constants'
import { getSafeSDK } from 'utils/web3'
import { GATEWAY_URL } from '@/config/constants'
import { getSafeSDK } from '@/services/web3'

const proposeTx = async (chainId: string, safeAddress: string, tx: SafeTransaction) => {
const sender = Web3.utils.toChecksumAddress(Web3.givenProvider.selectedAddress)
Expand Down
6 changes: 3 additions & 3 deletions services/useBalances.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { getBalances, SafeBalanceResponse } from '@gnosis.pm/safe-react-gateway-sdk'
import { useEffect } from 'react'
import { useAppDispatch, useAppSelector } from 'store'
import { selectSafeInfo } from 'store/safeInfoSlice'
import { GATEWAY_URL } from 'config/constants'
import { selectSafeInfo } from '@/store/safeInfoSlice'
import { GATEWAY_URL } from '@/config/constants'
import useAsync from './useAsync'
import { Errors, logError } from './exceptions'
import { setBalances } from 'store/balancesSlice'
import { setBalances } from '@/store/balancesSlice'

const loadBalances = (chainId: string, address: string) => {
return getBalances(GATEWAY_URL, chainId, address)
Expand Down
2 changes: 1 addition & 1 deletion services/useBaseGas.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type MetaTransactionData } from '@gnosis.pm/safe-core-sdk-types'
import { getWeb3ReadOnly } from 'utils/web3'
import { getWeb3ReadOnly } from '@/services/web3'
import useAsync from './useAsync'

const useBaseGas = (
Expand Down
4 changes: 2 additions & 2 deletions services/useChains.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { getChainsConfig, type ChainListResponse } from '@gnosis.pm/safe-react-gateway-sdk'
import { GATEWAY_URL } from 'config/constants'
import { GATEWAY_URL } from '@/config/constants'
import { useEffect } from 'react'
import { useAppDispatch } from 'store'
import { setChains } from 'store/chainsSlice'
import { setChains } from '@/store/chainsSlice'
import { Errors, logError } from './exceptions'
import useAsync from './useAsync'

Expand Down
2 changes: 1 addition & 1 deletion services/useSafeAddress.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useRouter } from 'next/router'
import chains from 'config/chains'
import chains from '@/config/chains'

const useSafeAddress = (): { address: string; chainId: string } => {
const router = useRouter()
Expand Down
Loading

0 comments on commit bfb9078

Please sign in to comment.