Skip to content

Commit

Permalink
feat:ui fix
Browse files Browse the repository at this point in the history
  • Loading branch information
constwz committed Oct 20, 2023
1 parent 4e76132 commit ef721a6
Show file tree
Hide file tree
Showing 25 changed files with 60 additions and 68 deletions.
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "safe-wallet-web",
"homepage": "https://github.com/safe-global/safe-wallet-web",
"license": "GPL-3.0",
"type": "module",
"version": "1.19.1",
"scripts": {
"dev": "next dev",
Expand Down Expand Up @@ -133,5 +132,10 @@
"typescript": "4.9.4",
"typescript-plugin-css-modules": "^4.2.2",
"webpack": "^5.88.2"
},
"tsconfig": {
"compilerOptions": {
"esModuleInterop": true
}
}
}
6 changes: 1 addition & 5 deletions src/components/common/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useRouter } from 'next/router'
import css from './styles.module.css'
import { AppRoutes } from '@/config/routes'
import packageJson from '../../../../package.json'
import AppstoreButton from '../AppStoreButton'
import ExternalLink from '../ExternalLink'
import MUILink from '@mui/material/Link'
import { IS_DEV, IS_OFFICIAL_HOST } from '@/config/constants'
Expand Down Expand Up @@ -69,17 +68,14 @@ const Footer = (): ReactElement | null => {
</li>
</>
) : (
<li>{'This is an unofficial distribution of Safe{Wallet}'}</li>
<li>{'This is an unofficial distribution of BNB Safe{Wallet}'}</li>
)}

<li>
<ExternalLink href={`${packageJson.homepage}/releases/tag/v${packageJson.version}`}>
v{packageJson.version}
</ExternalLink>
</li>
<li>
<AppstoreButton placement="footer" />
</li>
</ul>
</footer>
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/MetaTags/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { lightPalette, darkPalette } from '@safe-global/safe-react-components'

const descriptionText =
'Safe (prev. Gnosis Safe) is the most trusted platform to manage digital assets on Ethereum and multiple EVMs. Over $40B secured.'
const titleText = 'Safe{Wallet}'
const titleText = 'BNB Safe{Wallet}'

const MetaTags = ({ prefetchUrl }: { prefetchUrl: string }) => (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Alert } from '@mui/material'
const PairingDeprecationWarning = (): React.ReactElement => {
return (
<Alert severity="warning" sx={{ mb: 4 }}>
The {'Safe{Wallet}'} web-mobile pairing feature will be discontinued from 15th November 2023. Please migrate to a
different signer wallet before this date.
The {'BNB Safe{Wallet}'} web-mobile pairing feature will be discontinued from 15th November 2023. Please migrate
to a different signer wallet before this date.
</Alert>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const PairingDescription = (): ReactElement => {
return (
<>
<Typography variant="caption" align="center">
Scan this code in the {'Safe{Wallet}'} mobile app to sign transactions with your mobile device.
Scan this code in the {'BNB Safe{Wallet}'} mobile app to sign transactions with your mobile device.
<br />
<ExternalLink href={HelpCenterArticle.MOBILE_SAFE} title="Learn more about mobile pairing.">
Learn more about this feature.
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/CreationDialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const CreationDialog = () => {
<Dialog open={open}>
<DialogContent sx={{ paddingX: 8, paddingTop: 9, paddingBottom: 6 }}>
<Typography variant="h3" fontWeight="700" mb={1}>
Welcome to {'Safe{Wallet}'}!
Welcome to {'BNB Safe{Wallet}'}!
</Typography>
<Typography variant="body2">
Congratulations on your first step to truly unlock ownership. Enjoy the experience and discover our app.
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/Relaying/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const Relaying = () => {
return (
<WidgetContainer>
<Typography component="h2" variant="subtitle1" fontWeight={700} mb={2}>
New in {'Safe{Wallet}'}
New in {'BNB Safe{Wallet}'}
</Typography>

<WidgetBody>
Expand Down
2 changes: 1 addition & 1 deletion src/components/licenses/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SafeLicenses = () => {
<Box mb={4}>
<Typography mb={3}>
This page contains a list of attribution notices for third party software that may be contained in portions of
the {'Safe{Wallet}'}. We thank the open source community for all of their contributions.
the {'BNB Safe{Wallet}'}. We thank the open source community for all of their contributions.
</Typography>
<Typography variant="h2" mb={2}>
Android
Expand Down
28 changes: 14 additions & 14 deletions src/components/privacy/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ const SafePrivacyPolicy = () => {
&nbsp;released under LGPL-3.0.
</li>
<li>
&ldquo;{'Safe{Wallet}'}&rdquo; refers to a web-based graphical user interface for Safe Accounts as well as a
mobile application on Android and iOS.
&ldquo;{'BNB Safe{Wallet}'}&rdquo; refers to a web-based graphical user interface for Safe Accounts as well as
a mobile application on Android and iOS.
</li>
<li>
&ldquo;Safe Account Transaction&rdquo; is a Transaction of a Safe Account, authorized by a user, typically via
Expand Down Expand Up @@ -194,10 +194,10 @@ const SafePrivacyPolicy = () => {
BLOCKCHAIN WILL BECOME PUBLICLY AVAILABLE
</p>
<h3 id="4">4. How We Use Personal Data</h3>
<h4>4.1. When visiting our website and using {'Safe{Wallet}'}</h4>
<h4>4.1. When visiting our website and using {'BNB Safe{Wallet}'}</h4>
<p>
When visiting our website or using {'Safe{Wallet}'}, we may collect and process personal data. The data will be
stored in different instances
When visiting our website or using {'BNB Safe{Wallet}'}, we may collect and process personal data. The data will
be stored in different instances
</p>
<ol start={1} className={css.alphaList}>
<li>
Expand Down Expand Up @@ -235,7 +235,7 @@ const SafePrivacyPolicy = () => {
<ol start={4} className={css.alphaList}>
<li>
When you create a Profile for an existing Safe Account for the purpose of allowing you to view and use them in
the {'Safe{Wallet}'}, we process your
the {'BNB Safe{Wallet}'}, we process your
<ol start={1} className={css.romanList}>
<li>public Wallet address, </li>
<li>Safe Account balance, </li>
Expand Down Expand Up @@ -280,7 +280,7 @@ const SafePrivacyPolicy = () => {
<ol start={8} className={css.alphaList}>
<li>
When we collect relevant&nbsp;data&nbsp;from the Blockchain to display context information in the
{`Safe{Wallet}`}
{`BNB Safe{Wallet}`}
we process:
<ol start={1} className={css.romanList}>
<li>your public Wallet address, </li>
Expand Down Expand Up @@ -400,8 +400,8 @@ const SafePrivacyPolicy = () => {
<li>range of managed funds</li>
</ol>
<p>
In addition, we may take a recording of you while testing {'Safe{Wallet}'} for internal and external use. The
basis for this collection and processing is our legitimate business interest in monitoring and improving our
In addition, we may take a recording of you while testing {'BNB Safe{Wallet}'} for internal and external use.
The basis for this collection and processing is our legitimate business interest in monitoring and improving our
services.
</p>
<p>
Expand Down Expand Up @@ -568,7 +568,7 @@ const SafePrivacyPolicy = () => {
</p>
<h4>5.4. Mobile app stores</h4>
<p>
{'Safe{Wallet}'} mobile apps are distributed via{' '}
{'BNB Safe{Wallet}'} mobile apps are distributed via{' '}
<Link href="https://www.apple.com/app-store/" passHref legacyBehavior>
<MUILink target="_blank" rel="noreferrer">
Apple AppStore
Expand All @@ -586,10 +586,10 @@ const SafePrivacyPolicy = () => {
</p>
<h4>5.5. Fingerprint/Touch ID/ Face ID</h4>
<p>
We enable the user to unlock the {'Safe{Wallet}'} mobile app via biometrics information (touch ID or face ID).
This is a feature of the operating system. We do not store any of this data. Instead, the API of the operating
system is used to validate the user input. If you have any further questions you should consult with your
preferred mobile device provider or manufacturer.
We enable the user to unlock the {'BNB Safe{Wallet}'} mobile app via biometrics information (touch ID or face
ID). This is a feature of the operating system. We do not store any of this data. Instead, the API of the
operating system is used to validate the user input. If you have any further questions you should consult with
your preferred mobile device provider or manufacturer.
</p>
<h4>5.6. Google Firebase</h4>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/safe-apps/AddCustomAppModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export const AddCustomAppModal = ({ open, onClose, onSave, safeAppsList }: Props
})}
/>
}
label="This Safe App is not part of Safe{Wallet} and I agree to use it at my own risk."
label="This Safe App is not part of BNB Safe{Wallet} and I agree to use it at my own risk."
sx={{ mt: 2 }}
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const SafeAppsZeroResultsPlaceholder = ({ searchQuery }: { searchQuery: string }
text={
<Typography variant="body1" color="primary.light" m={2} maxWidth="600px">
No Safe Apps found matching <strong>{searchQuery}</strong>. Connect to dApps that haven&apos;t yet been
integrated with the {'Safe{Wallet}'} using the WalletConnect Safe App.
integrated with the {'BNB Safe{Wallet}'} using the WalletConnect Safe App.
</Typography>
}
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/settings/DataManagement/ImportFileUpload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const ImportFileUpload = ({

return (
<>
<Typography>Import {'Safe{Wallet}'} data by uploading a file in the area below.</Typography>
<Typography>Import {'BNB Safe{Wallet}'} data by uploading a file in the area below.</Typography>

<FileUpload
fileType={FileTypes.JSON}
Expand All @@ -74,7 +74,7 @@ export const ImportFileUpload = ({
mr: 0.5,
}}
/>
Only JSON files exported from the {'Safe{Wallet}'} can be imported.
Only JSON files exported from the {'BNB Safe{Wallet}'} can be imported.
</Typography>
</>
)
Expand Down
3 changes: 0 additions & 3 deletions src/components/settings/DataManagement/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { addedSafesSlice, selectAllAddedSafes } from '@/store/addedSafesSlice'
import { safeAppsSlice, selectSafeApps } from '@/store/safeAppsSlice'
import { selectSettings, settingsSlice } from '@/store/settingsSlice'
import InfoIcon from '@/public/images/notifications/info.svg'
import ExternalLink from '@/components/common/ExternalLink'
import { ImportFileUpload } from '@/components/settings/DataManagement/ImportFileUpload'
import { ImportDialog } from '@/components/settings/DataManagement/ImportDialog'
import { SAFE_EXPORT_VERSION } from '@/components/settings/DataManagement/useGlobalImportFileParser'
Expand Down Expand Up @@ -109,8 +108,6 @@ const DataManagement = () => {
mr: 0.5,
}}
/>
You can also export your data from the{' '}
<ExternalLink href="https://gnosis-safe.io/app/export">old app</ExternalLink>
</Typography>
</Grid>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const enum SAFE_EXPORT_VERSION {
}

export enum ImportErrors {
INVALID_VERSION = 'The file is not a Safe{Wallet} export.',
INVALID_VERSION = 'The file is not a BNB Safe{Wallet} export.',
INVALID_JSON_FORMAT = 'The JSON format is invalid.',
NO_IMPORT_DATA_FOUND = 'This file contains no importable data.',
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ describe('FallbackHandler', () => {
await waitFor(() => {
expect(
fbHandler.queryByText(
new RegExp('The Safe{Wallet} may not work correctly as no fallback handler is currently set.'),
new RegExp('The BNB Safe{Wallet} may not work correctly as no fallback handler is currently set.'),
),
).toBeInTheDocument()
expect(fbHandler.queryByText('Transaction Builder')).toBeInTheDocument()
Expand Down Expand Up @@ -171,7 +171,7 @@ describe('FallbackHandler', () => {
await waitFor(() => {
expect(
fbHandler.queryByText(
new RegExp('The Safe{Wallet} may not work correctly as no fallback handler is currently set.'),
new RegExp('The BNB Safe{Wallet} may not work correctly as no fallback handler is currently set.'),
),
).toBeInTheDocument()
expect(fbHandler.queryByText('Transaction Builder')).not.toBeInTheDocument()
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/FallbackHandler/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const FallbackHandler = (): ReactElement | null => {

const tooltip = !safe.fallbackHandler ? (
<>
The {'Safe{Wallet}'} may not work correctly as no fallback handler is currently set.
The {'BNB Safe{Wallet}'} may not work correctly as no fallback handler is currently set.
{txBuilder && (
<>
{' '}
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/SafeAppsSigningMethod/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const SafeAppsSigningMethod = () => {

<Grid item xs>
<Typography mb={2}>
This setting determines how the {'Safe{Wallet}'} will sign message requests from Safe Apps. Gasless,
This setting determines how the {'BNB Safe{Wallet}'} will sign message requests from Safe Apps. Gasless,
off-chain signing is used by default. Learn more about message signing{' '}
<ExternalLink href={HelpCenterArticle.SIGNED_MESSAGES}>here</ExternalLink>.
</Typography>
Expand Down
1 change: 0 additions & 1 deletion src/components/sidebar/Sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const Sidebar = (): ReactElement => {

<Divider flexItem />

{/* What's new + Need help? */}
<SidebarFooter />
</div>

Expand Down
14 changes: 2 additions & 12 deletions src/components/sidebar/SidebarFooter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ import { useAppDispatch, useAppSelector } from '@/store'
import { selectCookies, CookieType } from '@/store/cookiesSlice'
import { openCookieBanner } from '@/store/popupSlice'
import BeamerIcon from '@/public/images/sidebar/whats-new.svg'
import HelpCenterIcon from '@/public/images/sidebar/help-center.svg'
import { ListItem } from '@mui/material'
import DebugToggle from '../DebugToggle'
import { HELP_CENTER_URL, IS_PRODUCTION } from '@/config/constants'
import { IS_PRODUCTION } from '@/config/constants'
import Track from '@/components/common/Track'
import { OVERVIEW_EVENTS } from '@/services/analytics/events/overview'
import { useCurrentChain } from '@/hooks/useChains'
Expand Down Expand Up @@ -60,16 +59,7 @@ const SidebarFooter = (): ReactElement => {
</Track>

<Track {...OVERVIEW_EVENTS.HELP_CENTER}>
<ListItem disablePadding>
<a target="_blank" rel="noopener noreferrer" href={HELP_CENTER_URL} style={{ width: '100%' }}>
<SidebarListItemButton>
<SidebarListItemIcon color="primary">
<HelpCenterIcon />
</SidebarListItemIcon>
<SidebarListItemText bold>Need help?</SidebarListItemText>
</SidebarListItemButton>
</a>
</ListItem>
<ListItem disablePadding></ListItem>
</Track>
</SidebarList>
)
Expand Down
8 changes: 4 additions & 4 deletions src/components/terms/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ const SafeTerms = () => {
<li>&ldquo;Safe App&rdquo;</li>
</ol>
<p>
You may access Safe Accounts using the {'Safe{Wallet}'} web app, mobile app for iOS and android, or the browser
extension&nbsp;(each a &ldquo;Safe App&rdquo;). The Safe App may be used to manage your personal digital assets
on Ethereum and other common EVM chains when you connect a Safe Account with third-party&nbsp;services (as
defined below). The Safe App provides certain features that may be amended from time to time.{' '}
You may access Safe Accounts using the {'BNB Safe{Wallet}'} web app, mobile app for iOS and android, or the
browser extension&nbsp;(each a &ldquo;Safe App&rdquo;). The Safe App may be used to manage your personal digital
assets on Ethereum and other common EVM chains when you connect a Safe Account with third-party&nbsp;services
(as defined below). The Safe App provides certain features that may be amended from time to time.{' '}
</p>
<ol start={3}>
<li>&ldquo;Third-Party&nbsp;Safe Apps&rdquo;</li>
Expand Down
8 changes: 4 additions & 4 deletions src/components/welcome/NewSafe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const NewSafe = () => {
<Accordion className={css.accordion} onClick={toggleSafeList} expanded={expanded} defaultExpanded={true}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography variant="h4" display="inline" fontWeight={700}>
My Safe Accounts
My BNB Safe Accounts
</Typography>
</AccordionSummary>

Expand Down Expand Up @@ -89,7 +89,7 @@ const NewSafe = () => {
color="static.main"
mb={1}
>
Welcome to {'Safe{Wallet}'}
Welcome to {'BNB Safe{Wallet}'}
</Typography>

<Typography mb={5} color="static.main">
Expand All @@ -101,7 +101,7 @@ const NewSafe = () => {
<Paper className={css.createAddCard}>
<SvgIcon component={NewSafeIcon} inheritViewBox sx={{ width: '42px', height: '42px' }} />
<Typography variant="h3" fontWeight={700} mb={1} mt={3}>
Create Safe Account
Create BNB Safe Account
</Typography>

<Typography variant="body2" mb={3}>
Expand Down Expand Up @@ -133,7 +133,7 @@ const NewSafe = () => {
</Typography>

<Typography variant="body2" mb={3}>
Already have a Safe Account? Add it via its address.
Already have a BNB Safe Account? Add it via its address.
</Typography>

<span style={{ flex: 1 }} />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Home: NextPage = () => {
return (
<>
<Head>
<title>{'Safe{Wallet} – Dashboard'}</title>
<title>{'BNB Safe{Wallet} – Dashboard'}</title>
</Head>

<main>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/imprint.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Imprint: NextPage = () => {
return (
<>
<Head>
<title>{'Safe{Wallet} – Imprint'}</title>
<title>{'BNB Safe{Wallet} – Imprint'}</title>
</Head>

<main>{IS_OFFICIAL_HOST && <SafeImprint />}</main>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Welcome: NextPage = () => {
return (
<>
<Head>
<title>{'Safe{Wallet} – Welcome'}</title>
<title>{'BNB Safe{Wallet} – Welcome'}</title>
</Head>

<NewSafe />
Expand Down
Loading

0 comments on commit ef721a6

Please sign in to comment.