Fix: prefix switch for receive QR

safe-global · Nov 13, 2023 · a1958b9 · a1958b9
1 parent 937dabb
commit a1958b9
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 59 deletions.
diff --git a/src/components/balances/AssetsTable/NoAssets.tsx 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 (
+    <Paper>
+      <Grid container gap={3} alignItems="center" justifyContent="center" py={10} px={2}>
+        <Grid item>
+          <div>
+            <Box p={2} border="1px solid" borderColor="border.light" borderRadius={1} display="inline-block">
+              <QRCode value={qrCode} size={195} />
+            </Box>
+          </div>
+
+          <FormControlLabel
+            control={
+              <Switch checked={settings.shortName.qr} onChange={(e) => dispatch(setQrShortName(e.target.checked))} />
+            }
+            label={<>QR code with chain prefix</>}
+          />
+        </Grid>
+
+        <Grid item container xs={12} md={6} gap={2} flexDirection="column">
+          <Typography variant="h3" fontWeight="bold">
+            Add funds to get started
+          </Typography>
+
+          <Typography>
+            Add funds directly from your bank account or copy your address to send tokens from a different account.
+          </Typography>
+
+          <Box bgcolor="background.main" p={2} borderRadius="6px" alignSelf="flex-start" fontSize="14px">
+            <EthHashInfo address={safeAddress} shortAddress={false} showCopyButton hasExplorer avatarSize={24} />
+          </Box>
+
+          {rampSafeApp && (
+            <Box alignSelf="flex-start">
+              <Link
+                href={{ pathname: AppRoutes.apps.index, query: { safe: router.query.safe, appUrl: rampSafeApp.url } }}
+                passHref
+              >
+                <Button variant="contained" size="small" startIcon={<AddIcon />}>
+                  Buy crypto
+                </Button>
+              </Link>
+            </Box>
+          )}
+        </Grid>
+      </Grid>
+    </Paper>
+  )
+}
+
+export default NoAssets
diff --git 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 (
-    <Paper>
-      <Grid container gap={3} alignItems="center" justifyContent="center" py={10} px={2}>
-        <Grid item>
-          <Box p={2} border="1px solid" borderColor="border.light" borderRadius={1}>
-            <QRCode value={qrCode} size={195} />
-          </Box>
-        </Grid>
-        <Grid item container xs={12} md={6} gap={2} flexDirection="column">
-          <Typography variant="h3" fontWeight="bold">
-            Add funds to get started
-          </Typography>
-          <Typography>
-            Add funds directly from your bank account or copy your address to send tokens from a different account.
-          </Typography>
-          <Box bgcolor="background.main" p={2} borderRadius="6px" alignSelf="flex-start" fontSize="14px">
-            <EthHashInfo address={safeAddress} shortAddress={false} showCopyButton hasExplorer avatarSize={24} />
-          </Box>
-          {rampSafeApp && (
-            <Box alignSelf="flex-start">
-              <Link
-                href={{ pathname: AppRoutes.apps.index, query: { safe: router.query.safe, appUrl: rampSafeApp.url } }}
-                passHref
-              >
-                <Button variant="contained" size="small" startIcon={<AddIcon />}>
-                  Buy crypto
-                </Button>
-              </Link>
-            </Box>
-          )}
-        </Grid>
-      </Grid>
-    </Paper>
-  )
-}
-
 export default AssetsTable
diff --git a/src/pages/settings/appearance.tsx b/src/pages/settings/appearance.tsx
@@ -7,6 +7,7 @@ import { useAppDispatch, useAppSelector } from '@/store'
 import {
   selectSettings,
   setCopyShortName,
+  setQrShortName,
   setDarkMode,
   setShowShortName,
   setAddressEmojis,