(Fix) - Fixs tab selection (#960)
* Fixs tab selection * Refactor balances tab to use react router
This commit is contained in:
parent
710f6a5ab6
commit
971b2ee6d3
|
@ -10,15 +10,16 @@ import Modal from 'src/components/Modal'
|
||||||
import ButtonLink from 'src/components/layout/ButtonLink'
|
import ButtonLink from 'src/components/layout/ButtonLink'
|
||||||
import Col from 'src/components/layout/Col'
|
import Col from 'src/components/layout/Col'
|
||||||
import Divider from 'src/components/layout/Divider'
|
import Divider from 'src/components/layout/Divider'
|
||||||
import Link from 'src/components/layout/Link'
|
|
||||||
import Row from 'src/components/layout/Row'
|
import Row from 'src/components/layout/Row'
|
||||||
import { SAFELIST_ADDRESS } from 'src/routes/routes'
|
import { SAFELIST_ADDRESS } from 'src/routes/routes'
|
||||||
import SendModal from 'src/routes/safe/components/Balances/SendModal'
|
import SendModal from 'src/routes/safe/components/Balances/SendModal'
|
||||||
import CurrencyDropdown from 'src/routes/safe/components/CurrencyDropdown'
|
import CurrencyDropdown from 'src/routes/safe/components/CurrencyDropdown'
|
||||||
import { safeFeaturesEnabledSelector, safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
|
import { safeFeaturesEnabledSelector, safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
|
||||||
import { history } from 'src/store/index'
|
|
||||||
import { wrapInSuspense } from 'src/utils/wrapInSuspense'
|
import { wrapInSuspense } from 'src/utils/wrapInSuspense'
|
||||||
import { useFetchTokens } from '../../container/hooks/useFetchTokens'
|
import { useFetchTokens } from '../../container/hooks/useFetchTokens'
|
||||||
|
import { Route, Switch, NavLink, Redirect } from 'react-router-dom'
|
||||||
|
|
||||||
const Collectibles = React.lazy(() => import('src/routes/safe/components/Balances/Collectibles'))
|
const Collectibles = React.lazy(() => import('src/routes/safe/components/Balances/Collectibles'))
|
||||||
const Coins = React.lazy(() => import('src/routes/safe/components/Balances/Coins'))
|
const Coins = React.lazy(() => import('src/routes/safe/components/Balances/Coins'))
|
||||||
|
@ -28,15 +29,12 @@ export const BALANCE_ROW_TEST_ID = 'balance-row'
|
||||||
|
|
||||||
const INITIAL_STATE = {
|
const INITIAL_STATE = {
|
||||||
erc721Enabled: false,
|
erc721Enabled: false,
|
||||||
subMenuOptions: [],
|
|
||||||
showToken: false,
|
showToken: false,
|
||||||
showManageCollectibleModal: false,
|
showManageCollectibleModal: false,
|
||||||
sendFunds: {
|
sendFunds: {
|
||||||
isOpen: false,
|
isOpen: false,
|
||||||
selectedToken: undefined,
|
selectedToken: undefined,
|
||||||
},
|
},
|
||||||
showCoins: true,
|
|
||||||
showCollectibles: false,
|
|
||||||
showReceive: false,
|
showReceive: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,36 +50,13 @@ const Balances = (props) => {
|
||||||
useFetchTokens()
|
useFetchTokens()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const showCollectibles = COLLECTIBLES_LOCATION_REGEX.test(history.location.pathname)
|
|
||||||
const showCoins = COINS_LOCATION_REGEX.test(history.location.pathname)
|
|
||||||
const subMenuOptions = [{ enabled: showCoins, legend: 'Coins', url: `${SAFELIST_ADDRESS}/${address}/balances` }]
|
|
||||||
|
|
||||||
if (!showCollectibles && !showCoins) {
|
|
||||||
history.replace(`${SAFELIST_ADDRESS}/${address}/balances`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const erc721Enabled = featuresEnabled && featuresEnabled.includes('ERC721')
|
const erc721Enabled = featuresEnabled && featuresEnabled.includes('ERC721')
|
||||||
|
|
||||||
if (erc721Enabled) {
|
|
||||||
subMenuOptions.push({
|
|
||||||
enabled: showCollectibles,
|
|
||||||
legend: 'Collectibles',
|
|
||||||
url: `${SAFELIST_ADDRESS}/${address}/balances/collectibles`,
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
if (showCollectibles) {
|
|
||||||
history.replace(subMenuOptions[0].url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setState((prevState) => ({
|
setState((prevState) => ({
|
||||||
...prevState,
|
...prevState,
|
||||||
showCoins,
|
|
||||||
showCollectibles,
|
|
||||||
erc721Enabled,
|
erc721Enabled,
|
||||||
subMenuOptions,
|
|
||||||
}))
|
}))
|
||||||
}, [featuresEnabled, address])
|
}, [featuresEnabled])
|
||||||
|
|
||||||
const onShow = (action) => {
|
const onShow = (action) => {
|
||||||
setState((prevState) => ({ ...prevState, [`show${action}`]: true }))
|
setState((prevState) => ({ ...prevState, [`show${action}`]: true }))
|
||||||
|
@ -121,65 +96,116 @@ const Balances = (props) => {
|
||||||
receiveModal,
|
receiveModal,
|
||||||
tokenControls,
|
tokenControls,
|
||||||
} = props.classes
|
} = props.classes
|
||||||
const {
|
const { erc721Enabled, sendFunds, showManageCollectibleModal, showReceive, showToken } = state
|
||||||
erc721Enabled,
|
|
||||||
sendFunds,
|
|
||||||
showCoins,
|
|
||||||
showCollectibles,
|
|
||||||
showManageCollectibleModal,
|
|
||||||
showReceive,
|
|
||||||
showToken,
|
|
||||||
subMenuOptions,
|
|
||||||
} = state
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Row align="center" className={controls}>
|
<Row align="center" className={controls}>
|
||||||
<Col className={assetTabs} sm={6} start="sm" xs={12}>
|
<Col className={assetTabs} sm={6} start="sm" xs={12}>
|
||||||
{subMenuOptions.length > 1 &&
|
<NavLink
|
||||||
subMenuOptions.map(({ enabled, legend, url }, index) => (
|
to={`${SAFELIST_ADDRESS}/${address}/balances`}
|
||||||
<React.Fragment key={`legend-${index}`}>
|
activeClassName={assetTabActive}
|
||||||
{index > 0 && <Divider className={assetDivider} />}
|
className={assetTab}
|
||||||
<Link
|
data-testid={'coins-assets-btn'}
|
||||||
className={enabled ? assetTabActive : assetTab}
|
exact
|
||||||
data-testid={`${legend.toLowerCase()}'-assets-btn'`}
|
|
||||||
size="md"
|
|
||||||
to={url}
|
|
||||||
weight={enabled ? 'bold' : 'regular'}
|
|
||||||
>
|
|
||||||
{legend}
|
|
||||||
</Link>
|
|
||||||
</React.Fragment>
|
|
||||||
))}
|
|
||||||
</Col>
|
|
||||||
<Col className={tokenControls} end="sm" sm={6} xs={12}>
|
|
||||||
{showCoins && <CurrencyDropdown />}
|
|
||||||
<ButtonLink
|
|
||||||
className={manageTokensButton}
|
|
||||||
onClick={erc721Enabled && showCollectibles ? () => onShow('ManageCollectibleModal') : () => onShow('Token')}
|
|
||||||
size="lg"
|
|
||||||
testId="manage-tokens-btn"
|
|
||||||
>
|
>
|
||||||
Manage List
|
Coins
|
||||||
</ButtonLink>
|
</NavLink>
|
||||||
<Modal
|
<Divider className={assetDivider} />
|
||||||
description={
|
<NavLink
|
||||||
erc721Enabled ? 'Enable and disables assets to be listed' : 'Enable and disable tokens to be listed'
|
to={`${SAFELIST_ADDRESS}/${address}/balances/collectibles`}
|
||||||
}
|
activeClassName={assetTabActive}
|
||||||
handleClose={showManageCollectibleModal ? () => onHide('ManageCollectibleModal') : () => onHide('Token')}
|
className={assetTab}
|
||||||
open={showToken || showManageCollectibleModal}
|
data-testid={'collectibles-assets-btn'}
|
||||||
title="Manage List"
|
exact
|
||||||
>
|
>
|
||||||
<Tokens
|
Collectibles
|
||||||
modalScreen={showManageCollectibleModal ? 'assetsList' : 'tokenList'}
|
</NavLink>
|
||||||
onClose={showManageCollectibleModal ? () => onHide('ManageCollectibleModal') : () => onHide('Token')}
|
|
||||||
safeAddress={address}
|
|
||||||
/>
|
|
||||||
</Modal>
|
|
||||||
</Col>
|
</Col>
|
||||||
|
<Switch>
|
||||||
|
<Route
|
||||||
|
path={`${SAFELIST_ADDRESS}/${address}/balances/collectibles`}
|
||||||
|
exact
|
||||||
|
render={() => {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Col className={tokenControls} end="sm" sm={6} xs={12}>
|
||||||
|
<ButtonLink
|
||||||
|
className={manageTokensButton}
|
||||||
|
onClick={() => onShow('ManageCollectibleModal')}
|
||||||
|
size="lg"
|
||||||
|
testId="manage-tokens-btn"
|
||||||
|
>
|
||||||
|
Manage List
|
||||||
|
</ButtonLink>
|
||||||
|
<Modal
|
||||||
|
description={'Enable and disable tokens to be listed'}
|
||||||
|
handleClose={() => onHide('ManageCollectibleModal')}
|
||||||
|
open={showManageCollectibleModal}
|
||||||
|
title="Manage List"
|
||||||
|
>
|
||||||
|
<Tokens
|
||||||
|
modalScreen={'assetsList'}
|
||||||
|
onClose={() => onHide('ManageCollectibleModal')}
|
||||||
|
safeAddress={address}
|
||||||
|
/>
|
||||||
|
</Modal>
|
||||||
|
</Col>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path={`${SAFELIST_ADDRESS}/${address}/balances`}
|
||||||
|
exact
|
||||||
|
render={() => {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Col className={tokenControls} end="sm" sm={6} xs={12}>
|
||||||
|
<CurrencyDropdown />
|
||||||
|
<ButtonLink
|
||||||
|
className={manageTokensButton}
|
||||||
|
onClick={() => onShow('Token')}
|
||||||
|
size="lg"
|
||||||
|
testId="manage-tokens-btn"
|
||||||
|
>
|
||||||
|
Manage List
|
||||||
|
</ButtonLink>
|
||||||
|
<Modal
|
||||||
|
description={'Enable and disable tokens to be listed'}
|
||||||
|
handleClose={() => onHide('Token')}
|
||||||
|
open={showToken}
|
||||||
|
title="Manage List"
|
||||||
|
>
|
||||||
|
<Tokens modalScreen={'tokenList'} onClose={() => onHide('Token')} safeAddress={address} />
|
||||||
|
</Modal>
|
||||||
|
</Col>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Switch>
|
||||||
</Row>
|
</Row>
|
||||||
{showCoins && wrapInSuspense(<Coins showReceiveFunds={() => onShow('Receive')} showSendFunds={showSendFunds} />)}
|
<Switch>
|
||||||
{erc721Enabled && showCollectibles && wrapInSuspense(<Collectibles />)}
|
<Route
|
||||||
|
path={`${SAFELIST_ADDRESS}/${address}/balances/collectibles`}
|
||||||
|
exact
|
||||||
|
render={() => {
|
||||||
|
if (erc721Enabled) {
|
||||||
|
return wrapInSuspense(<Collectibles />)
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path={`${SAFELIST_ADDRESS}/${address}/balances`}
|
||||||
|
exact
|
||||||
|
render={() => {
|
||||||
|
return wrapInSuspense(<Coins showReceiveFunds={() => onShow('Receive')} showSendFunds={showSendFunds} />)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Redirect to={`${SAFELIST_ADDRESS}/${address}/balances`} />
|
||||||
|
</Switch>
|
||||||
<SendModal
|
<SendModal
|
||||||
activeScreenType="sendFunds"
|
activeScreenType="sendFunds"
|
||||||
isOpen={sendFunds.isOpen}
|
isOpen={sendFunds.isOpen}
|
||||||
|
|
Loading…
Reference in New Issue