Skip to content
This repository has been archived by the owner on Mar 30, 2022. It is now read-only.

V3.22.0 boba #8

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: Feature request
about: Create a feature request for the Gnosis Safe
about: Create a feature request for the Boba Multisig

---

<!--
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Gnosis Safe
# Boba Multisig

![license](https://img.shields.io/github/license/gnosis/safe-react)
![build](https://img.shields.io/github/workflow/status/gnosis/safe-react/Deploy%20to%20Mainnet%20network/main)
Expand Down
10 changes: 5 additions & 5 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<link rel="shortcut icon" href="favicon.ico" />
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<base href="%PUBLIC_URL%/" />
<title>Gnosis Safe</title>
<title>Boba Multisig</title>

<meta property="og:title" content="Gnosis Safe" />
<meta property="og:description" content="Gnosis Safe is the most trusted platform to manage digital assets on Ethereum" />
<meta property="og:title" content="Boba Multisig" />
<meta property="og:description" content="Boba Multisig is the most trusted platform to manage digital assets on Ethereum" />
<meta property="og:image" content="%PUBLIC_URL%/resources/og-image.png" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:image" content="%PUBLIC_URL%/resources/og-image.png" />
Expand All @@ -19,8 +19,8 @@
position: absolute;
top: 50%;
left: 50%;
width: 120px;
height: 120px;
width: 140px;
height: 195px;
margin: -60px 0 0 -60px;
animation: sk-bounce 2s infinite ease-in-out;
animation-delay: -1s;
Expand Down
Binary file added public/resources/safe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/components/AppLayout/Footer/Footer.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('<Footer>', () => {

const termsLinkNode = screen.getByText('Terms')

expect(termsLinkNode).toHaveAttribute('href', 'https://gnosis-safe.io/terms')
expect(termsLinkNode).toHaveAttribute('href', 'https://www.enya.ai/utility/terms')
expect(termsLinkNode).toHaveAttribute('target', '_blank')
})

Expand All @@ -50,7 +50,7 @@ describe('<Footer>', () => {

const privacyLinkNode = screen.getByText('Privacy')

expect(privacyLinkNode).toHaveAttribute('href', 'https://gnosis-safe.io/privacy')
expect(privacyLinkNode).toHaveAttribute('href', 'https://www.enya.ai/utility/privacy')
expect(privacyLinkNode).toHaveAttribute('target', '_blank')
})

Expand All @@ -68,7 +68,7 @@ describe('<Footer>', () => {

const imprintLinkNode = screen.getByText('Imprint')

expect(imprintLinkNode).toHaveAttribute('href', 'https://gnosis-safe.io/imprint')
expect(imprintLinkNode).toHaveAttribute('href', 'https://www.enya.ai/company/contact')
expect(imprintLinkNode).toHaveAttribute('target', '_blank')
})

Expand Down
22 changes: 11 additions & 11 deletions src/components/AppLayout/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const useStyles = makeStyles({
} as any)

const Footer = (): React.ReactElement => {
const appVersion = process.env.REACT_APP_APP_VERSION ? `v${process.env.REACT_APP_APP_VERSION} ` : 'Versions'
//const appVersion = process.env.REACT_APP_APP_VERSION ? `v${process.env.REACT_APP_APP_VERSION} ` : 'Versions'
const date = new Date()
const classes = useStyles()
const dispatch = useDispatch()
Expand All @@ -54,39 +54,39 @@ const Footer = (): React.ReactElement => {

return (
<footer className={classes.footer}>
<span className={classes.item}>©{date.getFullYear()} Gnosis</span>
<span className={classes.item}>©{date.getFullYear()} Enya</span>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/terms">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://www.enya.ai/utility/terms">
Terms
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/privacy">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://www.enya.ai/utility/privacy">
Privacy
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/licenses">
Licenses
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/imprint">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://www.enya.ai/company/contact">
Imprint
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/cookie">
{/* <Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/cookie">
Cookie Policy
</Link>
<span className={classes.sep}>-</span>
</Link>
<span className={classes.sep}>-</span>*/}
<GnoButtonLink className={cn(classes.item, classes.link, classes.buttonLink)} onClick={openCookiesHandler}>
Preferences
</GnoButtonLink>
<span className={classes.sep}>|</span>
<Link
{/*<span className={classes.sep}>|</span>
<Link
className={cn(classes.item, classes.link)}
target="_blank"
to="https://github.com/gnosis/safe-react/releases"
>
{appVersion}
</Link>
</Link> */}
</footer>
)
}
Expand Down
42 changes: 42 additions & 0 deletions src/components/AppLayout/Header/assets/boba_logo_black_final.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/AppLayout/Header/components/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Img from 'src/components/layout/Img'
import Row from 'src/components/layout/Row'
import { headerHeight, md, screenSm, sm } from 'src/theme/variables'
import { useStateHandler } from 'src/logic/hooks/useStateHandler'
import SafeLogo from '../assets/gnosis-safe-multisig-logo.svg'
import SafeLogo from '../assets/boba_logo_black_final.svg'
import { WELCOME_ROUTE } from 'src/routes/routes'
import WalletSwitch from 'src/components/WalletSwitch'
import Divider from 'src/components/layout/Divider'
Expand Down Expand Up @@ -96,7 +96,7 @@ const Layout = ({ classes, providerDetails, providerInfo }) => {
<Row className={classes.summary}>
<Col className={classes.logo} middle="xs" start="xs">
<Link to={WELCOME_ROUTE}>
<Img alt="Gnosis Safe" height={36} src={SafeLogo} testId="heading-gnosis-logo" id="safe-logo" />
<Img alt="Boba Multisig" height={36} src={SafeLogo} testId="heading-gnosis-logo" id="safe-logo" />
</Link>
</Col>

Expand Down
2 changes: 1 addition & 1 deletion src/components/AppLayout/MobileNotSupported/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const MobileNotSupported = ({ onClose }: Props): ReactElement => {
<Overlay>
<ModalApp>
<StyledCard>
<Text size="lg">The Gnosis Safe web app is not optimized for mobile.</Text>
<Text size="lg">The Boba Multisig web app is not optimized for mobile.</Text>
<Text size="lg">Get the mobile app for a better experience.</Text>
<Button size="md" color="primary" variant="contained">
<StyledLink target="_blank" href="https://gnosis-safe.io/#mobile" rel="noopener noreferrer">
Expand Down
2 changes: 1 addition & 1 deletion src/logic/wallets/onboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const getOnboard = (chainId: ChainId): API => {
: undefined,
},
walletSelect: {
description: 'Please select a wallet to connect to Gnosis Safe',
description: 'Please select a wallet to connect to Boba Multisig',
wallets: getSupportedWallets(chainId),
},
walletCheck: [
Expand Down
8 changes: 4 additions & 4 deletions src/logic/wallets/utils/walletList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ const wallets = (chainId: ChainId): Wallet[] => {
// { preferred: true, desktop: true }
{
walletName: WALLETS.TREZOR,
appUrl: 'gnosis-safe.io',
appUrl: 'multisig.boba.network',
preferred: true,
email: '[email protected]',
email: '[email protected]',
desktop: true,
rpcUrl,
},
Expand All @@ -40,13 +40,13 @@ const wallets = (chainId: ChainId): Wallet[] => {
walletName: WALLETS.KEYSTONE,
desktop: false,
rpcUrl,
appName: 'Gnosis Safe',
appName: 'Boba Multisig',
},
{ walletName: WALLETS.TRUST, preferred: true, desktop: false },
{
walletName: WALLETS.LATTICE,
rpcUrl,
appName: 'Gnosis Safe',
appName: 'Boba Multisig',
desktop: false,
},
{
Expand Down
17 changes: 9 additions & 8 deletions src/routes/CreateSafePage/steps/NameNewSafeStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ function NameNewSafeStep(): ReactElement {
<BlockWithPadding data-testid={'create-safe-name-step'}>
<Block margin="md">
<Paragraph color="primary" noMargin size="lg">
You are about to create a new Gnosis Safe wallet with one or more owners. First, let&apos;s give your new
wallet a name. This name is only stored locally and will never be shared with Gnosis or any third parties. The
You are about to create a new Boba Multisig wallet with one or more owners. First, let&apos;s give your new
wallet a name. This name is only stored locally and will never be shared with Boba or any third parties. The
new Safe will ONLY be available on <NetworkLabel />
</Paragraph>
</Block>
Expand All @@ -96,15 +96,16 @@ function NameNewSafeStep(): ReactElement {
</FieldContainer>
<Block margin="lg">
<Paragraph color="primary" noMargin size="lg">
By continuing you consent to the{' '}
<Link href="https://gnosis-safe.io/terms" rel="noopener noreferrer" target="_blank">
By continuing you consent with the{' '}
<Link href="https://www.enya.ai/utility/terms" rel="noopener noreferrer" target="_blank">
terms of use
</Link>
{' and '}
<Link href="https://gnosis-safe.io/privacy" rel="noopener noreferrer" target="_blank">
</Link>{' '}
and{' '}
<Link href="https://www.enya.ai/utility/privacy" rel="noopener noreferrer" target="_blank">
privacy policy
</Link>
.
. Most importantly, you confirm that your funds are held securely in the Boba Multisig, a smart contract on
the Ethereum blockchain. These funds cannot be accessed by Boba at any point.
</Paragraph>
</Block>
</BlockWithPadding>
Expand Down
9 changes: 5 additions & 4 deletions src/routes/LoadSafePage/steps/LoadSafeAddressStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function LoadSafeAddressStep(): ReactElement {
<Container data-testid={'load-safe-address-step'}>
<Block margin="md">
<Paragraph color="primary" noMargin size="lg">
You are about to add an existing Gnosis Safe on <NetworkLabel />. First, choose a name and enter the Safe
You are about to add an existing Boba Multisig on <NetworkLabel />. First, choose a name and enter the Safe
address. The name is only stored locally and will never be shared with Gnosis or any third parties.
</Paragraph>
<Paragraph color="primary" size="lg">
Expand Down Expand Up @@ -194,14 +194,15 @@ function LoadSafeAddressStep(): ReactElement {
<Block margin="sm">
<Paragraph color="primary" noMargin size="lg">
By continuing you consent to the{' '}
<StyledLink href="https://gnosis-safe.io/terms" rel="noopener noreferrer" target="_blank">
<StyledLink href="https://www.enya.ai/utility/terms" rel="noopener noreferrer" target="_blank">
terms of use
</StyledLink>
{' and '}
<StyledLink href="https://gnosis-safe.io/privacy" rel="noopener noreferrer" target="_blank">
<StyledLink href="https://www.enya.ai/utility/privacy" rel="noopener noreferrer" target="_blank">
privacy policy
</StyledLink>
.
. Most importantly, you confirm that your funds are held securely in the Boba Multisig, a smart contract on
the Ethereum blockchain. These funds cannot be accessed by Gnosis at any point.
</Paragraph>
</Block>
</Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const ImportEntriesModal = ({ importEntryModalHandler, isOpen, onClose }: Import
)}
{!csvLoaded && importError === '' && (
<Text color="text" as="p" size="xl">
Only CSV files exported from Gnosis Safe are allowed. <br />
Only CSV files exported from Boba Multisig are allowed. <br />
<HelpInfo />
</Text>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const LoadedApp = (): React.ReactElement => (
url: '',
name: 'Gnosis',
iconUrl: 'https://cryptologos.cc/logos/versions/gnosis-gno-gno-logo-circle.svg?v=007',
description: 'Gnosis safe app',
description: 'Boba Multisig app',
fetchStatus: FETCH_STATUS.SUCCESS,
chainIds: ['4'],
accessControl: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const LegalDisclaimer = ({ onCancel, onConfirm }: OwnProps): JSX.Element => (
<br />
<Text size="md">
I have read and understood the{' '}
<a href="https://gnosis-safe.io/terms" rel="noopener noreferrer" target="_blank">
<a href="https://www.enya.ai/utility/terms" rel="noopener noreferrer" target="_blank">
Terms
</a>{' '}
and this Disclaimer, and agree to be bound by them.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export const ReviewMessage = ({
/>
<InfoMessage>
<Icon size="md" type="info" color="warning" />
Signing a message with the Gnosis Safe requires a transaction on the blockchain
Signing a message with the Boba Multisig requires a transaction on the blockchain
</InfoMessage>
</Container>
</TxModalWrapper>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/safe/components/Settings/Advanced/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const Advanced = (): ReactElement => {
Safe Nonce
</Title>
<InfoText size="lg">
For security reasons, transactions made with Gnosis Safe need to be executed in order. The nonce shows you
For security reasons, transactions made with Boba Multisig need to be executed in order. The nonce shows you
which transaction will be executed next. You can find the nonce for a transaction in the transaction details.
</InfoText>
<InfoText color="secondaryLight" size="xl">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const UpdateSafeModal = ({ onClose, safeAddress, safeCurrentVersion }: Pr
<Paragraph>
To check details about updates added by this smart contract version please visit{' '}
<Link target="_blank" to={`https://github.com/gnosis/safe-contracts/releases/tag/v${LATEST_SAFE_VERSION}`}>
latest Gnosis Safe contracts changelog
latest Boba Multisig contracts changelog
</Link>
</Paragraph>
<Paragraph noMargin>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/welcome/Welcome.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('<Welcome>', () => {
it('Should render Welcome container', () => {
render(<Welcome />)

expect(screen.getByText('Welcome to Gnosis Safe.')).toBeInTheDocument()
expect(screen.getByText('Welcome to Boba Multisig.')).toBeInTheDocument()
})

it('Create new Safe button should redirect to /open if a wallet is already selected', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/routes/welcome/Welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ function Welcome(): ReactElement {
<Page align="center">
<Block>
<Title size="md" strong>
Welcome to Gnosis Safe.
Welcome to Boba Multisig.
</Title>
<Title size="xs">
Gnosis Safe is the most trusted platform to manage digital assets. <br /> Here is how to get started:
Boba Multisig is the most trusted platform to manage digital assets. <br /> Here is how to get started:
</Title>
<CardsContainer>
<StyledCard>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/googleAnalytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const loadGoogleAnalytics = (): void => {

const customDimensions: ReactGA.FieldsObject = {
anonymizeIp: true,
appName: `Gnosis Safe Web`,
appName: `Boba Multisig Web`,
appVersion: process.env.REACT_APP_APP_VERSION,
dimension1: _getChainId(),
}
Expand Down