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.

Sign up for GitHub

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

fix: close transaction modal if already on href #2527

Merged
merged 2 commits into from
Sep 22, 2023
Merged

fix: close transaction modal if already on href #2527

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c680af
fix: close transaction modal if already on `href`
iamacook Sep 19, 2023
f92aa43
fix: Transaction Builder link
iamacook Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/components/tx-flow/common/TxButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { useTxBuilderApp } from '@/hooks/safe-apps/useTxBuilderApp'
import { AppRoutes } from '@/config/routes'
import Track from '@/components/common/Track'
import { MODALS_EVENTS } from '@/services/analytics'
import { useContext } from 'react'
import { TxModalContext } from '..'

const buttonSx = {
height: '58px',
Expand All @@ -24,11 +26,15 @@ export const SendTokensButton = ({ onClick, sx }: { onClick: () => void; sx?: Bu

export const SendNFTsButton = () => {
const router = useRouter()
const { setTxFlow } = useContext(TxModalContext)

const isNftPage = router.pathname === AppRoutes.balances.nfts
const onClick = isNftPage ? () => setTxFlow(undefined) : undefined

return (
<Track {...MODALS_EVENTS.SEND_COLLECTIBLE}>
<Link href={{ pathname: AppRoutes.balances.nfts, query: { safe: router.query.safe } }} passHref legacyBehavior>
<Button variant="contained" sx={buttonSx} fullWidth>
<Button variant="contained" sx={buttonSx} fullWidth onClick={onClick}>
Send NFTs
</Button>
</Link>
Expand All @@ -38,12 +44,18 @@ export const SendNFTsButton = () => {

export const TxBuilderButton = () => {
const txBuilder = useTxBuilderApp()
const router = useRouter()
const { setTxFlow } = useContext(TxModalContext)

if (!txBuilder?.app) return null

const isTxBuilder = typeof txBuilder.link.query === 'object' && router.query.appUrl === txBuilder.link.query?.appUrl
const onClick = isTxBuilder ? () => setTxFlow(undefined) : undefined

return (
<Track {...MODALS_EVENTS.CONTRACT_INTERACTION}>
<Link href={txBuilder.link} passHref style={{ width: '100%' }}>
<Button variant="outlined" sx={buttonSx} fullWidth>
<Button variant="outlined" sx={buttonSx} fullWidth onClick={onClick}>
Transaction Builder
</Button>
</Link>
Expand Down