From f3fc362f7cc196d58dbc3c23337e24927fc82a25 Mon Sep 17 00:00:00 2001
From: katspaugh <381895+katspaugh@users.noreply.github.com>
Date: Mon, 13 Nov 2023 13:44:56 +0100
Subject: [PATCH] Fix: prefix switch for receive QR (#2795)
---
.../balances/AssetsTable/NoAssets.tsx | 76 +++++++++++++++++++
src/components/balances/AssetsTable/index.tsx | 61 +--------------
2 files changed, 78 insertions(+), 59 deletions(-)
create mode 100644 src/components/balances/AssetsTable/NoAssets.tsx
diff --git a/src/components/balances/AssetsTable/NoAssets.tsx b/src/components/balances/AssetsTable/NoAssets.tsx
new file mode 100644
index 0000000000..ebf337c6f6
--- /dev/null
+++ b/src/components/balances/AssetsTable/NoAssets.tsx
@@ -0,0 +1,76 @@
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import { Box, Button, FormControlLabel, Grid, Paper, Switch, Typography } from '@mui/material'
+import EthHashInfo from '@/components/common/EthHashInfo'
+import QRCode from '@/components/common/QRCode'
+import { AppRoutes } from '@/config/routes'
+import { useRemoteSafeApps } from '@/hooks/safe-apps/useRemoteSafeApps'
+import { useCurrentChain } from '@/hooks/useChains'
+import useSafeAddress from '@/hooks/useSafeAddress'
+import { useAppDispatch, useAppSelector } from '@/store'
+import { selectSettings, setQrShortName } from '@/store/settingsSlice'
+import AddIcon from '@mui/icons-material/Add'
+
+const NoAssets = () => {
+ const router = useRouter()
+ const safeAddress = useSafeAddress()
+ const chain = useCurrentChain()
+ const dispatch = useAppDispatch()
+ const settings = useAppSelector(selectSettings)
+ const qrPrefix = settings.shortName.qr ? `${chain?.shortName}:` : ''
+ const qrCode = `${qrPrefix}${safeAddress}`
+ const [apps] = useRemoteSafeApps()
+
+ // @FIXME: use tags instead of name
+ const rampSafeApp = apps?.find((app) => app.name === 'Ramp Network')
+
+ return (
+
+
+
+
+
+
+
+
+
+ dispatch(setQrShortName(e.target.checked))} />
+ }
+ label={<>QR code with chain prefix>}
+ />
+
+
+
+
+ Add funds to get started
+
+
+
+ Add funds directly from your bank account or copy your address to send tokens from a different account.
+
+
+
+
+
+
+ {rampSafeApp && (
+
+
+ }>
+ Buy crypto
+
+
+
+ )}
+
+
+
+ )
+}
+
+export default NoAssets
diff --git a/src/components/balances/AssetsTable/index.tsx b/src/components/balances/AssetsTable/index.tsx
index 599c8c2704..57c0a28c16 100644
--- a/src/components/balances/AssetsTable/index.tsx
+++ b/src/components/balances/AssetsTable/index.tsx
@@ -1,15 +1,5 @@
-import EthHashInfo from '@/components/common/EthHashInfo'
-import QRCode from '@/components/common/QRCode'
-import { AppRoutes } from '@/config/routes'
-import { useRemoteSafeApps } from '@/hooks/safe-apps/useRemoteSafeApps'
-import { useCurrentChain } from '@/hooks/useChains'
-import useSafeAddress from '@/hooks/useSafeAddress'
-import { useAppSelector } from '@/store'
-import { selectSettings } from '@/store/settingsSlice'
-import Link from 'next/link'
-import { useRouter } from 'next/router'
import { type ReactElement, useMemo, useContext } from 'react'
-import { Button, Tooltip, Typography, SvgIcon, IconButton, Box, Checkbox, Skeleton, Paper, Grid } from '@mui/material'
+import { Button, Tooltip, Typography, SvgIcon, IconButton, Box, Checkbox, Skeleton } from '@mui/material'
import type { TokenInfo } from '@safe-global/safe-gateway-typescript-sdk'
import { TokenType } from '@safe-global/safe-gateway-typescript-sdk'
import css from './styles.module.css'
@@ -30,7 +20,7 @@ import CheckWallet from '@/components/common/CheckWallet'
import useSpendingLimit from '@/hooks/useSpendingLimit'
import { TxModalContext } from '@/components/tx-flow'
import TokenTransferFlow from '@/components/tx-flow/flows/TokenTransfer'
-import AddIcon from '@mui/icons-material/Add'
+import NoAssets from './NoAssets'
const skeletonCells: EnhancedTableProps['rows'][0]['cells'] = {
asset: {
@@ -271,51 +261,4 @@ const AssetsTable = ({
)
}
-const NoAssets = () => {
- const router = useRouter()
- const safeAddress = useSafeAddress()
- const chain = useCurrentChain()
- const settings = useAppSelector(selectSettings)
- const qrPrefix = settings.shortName.qr ? `${chain?.shortName}:` : ''
- const qrCode = `${qrPrefix}${safeAddress}`
- const [apps] = useRemoteSafeApps()
-
- const rampSafeApp = apps?.find((app) => app.name === 'Ramp Network')
-
- return (
-
-
-
-
-
-
-
-
-
- Add funds to get started
-
-
- Add funds directly from your bank account or copy your address to send tokens from a different account.
-
-
-
-
- {rampSafeApp && (
-
-
- }>
- Buy crypto
-
-
-
- )}
-
-
-
- )
-}
-
export default AssetsTable